Replace @IMPORT_QT_QUICK@ with "import QtQuick 2.0"

QFSFileEngine and QAbstractFileEngineHandler are not available in Qt5
We will hardcode import QtQuick 2.0 to make Qt5 happy and will replace
it with QtQuick 1.1 when not using Qt5

diff --git a/qml/CameraSettings.qml b/qml/CameraSettings.qml
index 062044c..44c86ee 100644 (file)
--- a/qml/CameraSettings.qml
+++ b/qml/CameraSettings.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 
 Column {
     id: col

diff --git a/qml/CameraToolBar.qml b/qml/CameraToolBar.qml
index f75a789..a31de13 100644 (file)
--- a/qml/CameraToolBar.qml
+++ b/qml/CameraToolBar.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import "CameraToolBar.js" as Layout
 
 Rectangle {

diff --git a/qml/CameraView.qml b/qml/CameraView.qml
index ac4c778..813a098 100644 (file)
--- a/qml/CameraView.qml
+++ b/qml/CameraView.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import QtCamera 1.0
 import CameraPlus 1.0
 

diff --git a/qml/CaptureButton.qml b/qml/CaptureButton.qml
index 9f0dde5..090bb64 100644 (file)
--- a/qml/CaptureButton.qml
+++ b/qml/CaptureButton.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 
 Item {
     id: button

diff --git a/qml/CheckButton.qml b/qml/CheckButton.qml
index f00fff8..b2ab3dc 100644 (file)
--- a/qml/CheckButton.qml
+++ b/qml/CheckButton.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 
 CameraToolIcon {
     id: button

diff --git a/qml/FlashButton.qml b/qml/FlashButton.qml
index b6ae252..ba62c21 100644 (file)
--- a/qml/FlashButton.qml
+++ b/qml/FlashButton.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import QtCamera 1.0
 import "data.js" as Data
 

diff --git a/qml/FocusReticle.qml b/qml/FocusReticle.qml
index c086ec7..bf37899 100644 (file)
--- a/qml/FocusReticle.qml
+++ b/qml/FocusReticle.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import QtCamera 1.0
 import CameraPlus 1.0
 

diff --git a/qml/ImageColorFilterButton.qml b/qml/ImageColorFilterButton.qml
index 2b9eb5a..7d35ad7 100644 (file)
--- a/qml/ImageColorFilterButton.qml
+++ b/qml/ImageColorFilterButton.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import QtCamera 1.0
 import "data.js" as Data
 

diff --git a/qml/ImageEvCompButton.qml b/qml/ImageEvCompButton.qml
index 02b0f0d..3761a70 100644 (file)
--- a/qml/ImageEvCompButton.qml
+++ b/qml/ImageEvCompButton.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import QtCamera 1.0
 
 CameraToolIcon {

diff --git a/qml/ImageIsoButton.qml b/qml/ImageIsoButton.qml
index a4d5f2f..099f9d6 100644 (file)
--- a/qml/ImageIsoButton.qml
+++ b/qml/ImageIsoButton.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import QtCamera 1.0
 import "data.js" as Data
 

diff --git a/qml/ImageOverlay.qml b/qml/ImageOverlay.qml
index 7589e53..b744fdb 100644 (file)
--- a/qml/ImageOverlay.qml
+++ b/qml/ImageOverlay.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import QtCamera 1.0
 import CameraPlus 1.0
 import "data.js" as Data

diff --git a/qml/ImageResolutionSettings.qml b/qml/ImageResolutionSettings.qml
index 17ad2cf..63ce485 100644 (file)
--- a/qml/ImageResolutionSettings.qml
+++ b/qml/ImageResolutionSettings.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 
 Column {
     spacing: 10

diff --git a/qml/ImageSceneButton.qml b/qml/ImageSceneButton.qml
index 5750f58..2393e6e 100644 (file)
--- a/qml/ImageSceneButton.qml
+++ b/qml/ImageSceneButton.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import QtCamera 1.0
 import "data.js" as Data
 

diff --git a/qml/ImageSettings.qml b/qml/ImageSettings.qml
index a5b07fb..3fb37ed 100644 (file)
--- a/qml/ImageSettings.qml
+++ b/qml/ImageSettings.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import QtCamera 1.0
 
 Flickable {

diff --git a/qml/ImageWhiteBalanceButton.qml b/qml/ImageWhiteBalanceButton.qml
index 2cbf7c5..808b854 100644 (file)
--- a/qml/ImageWhiteBalanceButton.qml
+++ b/qml/ImageWhiteBalanceButton.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import QtCamera 1.0
 import "data.js" as Data
 

diff --git a/qml/Indicator.qml b/qml/Indicator.qml
index da59619..192afff 100644 (file)
--- a/qml/Indicator.qml
+++ b/qml/Indicator.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 
 Image {
         anchors.left: parent.left

diff --git a/qml/ModeButton.qml b/qml/ModeButton.qml
index 0063e7e..ea959bd 100644 (file)
--- a/qml/ModeButton.qml
+++ b/qml/ModeButton.qml
@@ -21,7 +21,7 @@
  */
 
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import QtCamera 1.0
 
 CaptureButton {

diff --git a/qml/ModeController.qml b/qml/ModeController.qml
index faa80db..e751ef0 100644 (file)
--- a/qml/ModeController.qml
+++ b/qml/ModeController.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import QtCamera 1.0
 
 Item {

diff --git a/qml/PipelineManager.qml b/qml/PipelineManager.qml
index 04294ba..f6b82d9 100644 (file)
--- a/qml/PipelineManager.qml
+++ b/qml/PipelineManager.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import QtCamera 1.0
 import CameraPlus 1.0
 

diff --git a/qml/PostCaptureItem.qml b/qml/PostCaptureItem.qml
index 4d925b0..824f851 100644 (file)
--- a/qml/PostCaptureItem.qml
+++ b/qml/PostCaptureItem.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import CameraPlus 1.0
 
 Item {

diff --git a/qml/PostCaptureView.qml b/qml/PostCaptureView.qml
index ea5b700..75f4371 100644 (file)
--- a/qml/PostCaptureView.qml
+++ b/qml/PostCaptureView.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import CameraPlus 1.0
 import QtCamera 1.0
 

diff --git a/qml/PreviewImage.qml b/qml/PreviewImage.qml
index 4850bd2..e3f7880 100644 (file)
--- a/qml/PreviewImage.qml
+++ b/qml/PreviewImage.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import QtCamera 1.0
 
 Image {

diff --git a/qml/RecordingDurationLabel.qml b/qml/RecordingDurationLabel.qml
index 4bd5cb7..8362195 100644 (file)
--- a/qml/RecordingDurationLabel.qml
+++ b/qml/RecordingDurationLabel.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 
 Rectangle {
     property int duration

diff --git a/qml/SectionHeader.qml b/qml/SectionHeader.qml
index 0fc9e47..59a46f8 100644 (file)
--- a/qml/SectionHeader.qml
+++ b/qml/SectionHeader.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 
 Row {
     id: root

diff --git a/qml/SettingsView.qml b/qml/SettingsView.qml
index 40ac8fd..0176027 100644 (file)
--- a/qml/SettingsView.qml
+++ b/qml/SettingsView.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import QtCamera 1.0
 import CameraPlus 1.0
 

diff --git a/qml/Standby.qml b/qml/Standby.qml
index 845b489..f3f0229 100644 (file)
--- a/qml/Standby.qml
+++ b/qml/Standby.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 
 Rectangle {
     id: standby

diff --git a/qml/TextSwitch.qml b/qml/TextSwitch.qml
index c19665d..4d95d8b 100644 (file)
--- a/qml/TextSwitch.qml
+++ b/qml/TextSwitch.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 
 Item {
     property alias text: label.text

diff --git a/qml/VideoColorFilterButton.qml b/qml/VideoColorFilterButton.qml
index 46a5bb4..60f702a 100644 (file)
--- a/qml/VideoColorFilterButton.qml
+++ b/qml/VideoColorFilterButton.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import QtCamera 1.0
 import "data.js" as Data
 

diff --git a/qml/VideoEvCompButton.qml b/qml/VideoEvCompButton.qml
index 6721b4d..5306a3b 100644 (file)
--- a/qml/VideoEvCompButton.qml
+++ b/qml/VideoEvCompButton.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import QtCamera 1.0
 
 CameraToolIcon {

diff --git a/qml/VideoMuteButton.qml b/qml/VideoMuteButton.qml
index a5728ce..f698dcb 100644 (file)
--- a/qml/VideoMuteButton.qml
+++ b/qml/VideoMuteButton.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 
 CameraToolIcon {
     iconSource: settings.videoMuted ? "image://theme/icon-m-toolbar-volume-off-white-selected" :

diff --git a/qml/VideoOverlay.qml b/qml/VideoOverlay.qml
index 07e55f8..d5d2ab0 100644 (file)
--- a/qml/VideoOverlay.qml
+++ b/qml/VideoOverlay.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import QtCamera 1.0
 import CameraPlus 1.0
 import "data.js" as Data

diff --git a/qml/VideoPlayerPage.qml b/qml/VideoPlayerPage.qml
index 2b700c0..535510e 100644 (file)
--- a/qml/VideoPlayerPage.qml
+++ b/qml/VideoPlayerPage.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import CameraPlus 1.0
 import QtCamera 1.0
 import QtCameraExtras 1.0

diff --git a/qml/VideoResolutionSettings.qml b/qml/VideoResolutionSettings.qml
index 9be1a10..5100116 100644 (file)
--- a/qml/VideoResolutionSettings.qml
+++ b/qml/VideoResolutionSettings.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 
 Column {
     spacing: 10

diff --git a/qml/VideoSceneButton.qml b/qml/VideoSceneButton.qml
index 4d59a24..2ab0bc8 100644 (file)
--- a/qml/VideoSceneButton.qml
+++ b/qml/VideoSceneButton.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import QtCamera 1.0
 import "data.js" as Data
 

diff --git a/qml/VideoSettings.qml b/qml/VideoSettings.qml
index 7df57e0..7b740e3 100644 (file)
--- a/qml/VideoSettings.qml
+++ b/qml/VideoSettings.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import QtCamera 1.0
 
 Flickable {

diff --git a/qml/VideoTorchButton.qml b/qml/VideoTorchButton.qml
index 05d8290..dda5a2b 100644 (file)
--- a/qml/VideoTorchButton.qml
+++ b/qml/VideoTorchButton.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import QtCamera 1.0
 
 CameraToolIcon {

diff --git a/qml/VideoWhiteBalanceButton.qml b/qml/VideoWhiteBalanceButton.qml
index d5e73d3..7e8eca0 100644 (file)
--- a/qml/VideoWhiteBalanceButton.qml
+++ b/qml/VideoWhiteBalanceButton.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import QtCamera 1.0
 import "data.js" as Data
 

diff --git a/qml/ZoomCaptureButton.qml b/qml/ZoomCaptureButton.qml
index 54ef205..b3e531e 100644 (file)
--- a/qml/ZoomCaptureButton.qml
+++ b/qml/ZoomCaptureButton.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import CameraPlus 1.0
 
 Item {

diff --git a/qml/ZoomCaptureCancel.qml b/qml/ZoomCaptureCancel.qml
index 25fc786..b17d1a5 100644 (file)
--- a/qml/ZoomCaptureCancel.qml
+++ b/qml/ZoomCaptureCancel.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import CameraPlus 1.0
 
 MouseArea {

diff --git a/qml/ZoomSlider.qml b/qml/ZoomSlider.qml
index 92fd688..0f0b74a 100644 (file)
--- a/qml/ZoomSlider.qml
+++ b/qml/ZoomSlider.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import QtCamera 1.0
 
 CameraSlider {

diff --git a/qml/main.qml b/qml/main.qml
index efae4d4..47cc439 100644 (file)
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
+import QtQuick 2.0
 import QtCamera 1.0
 import CameraPlus 1.0
 import QtMobility.location 1.2

diff --git a/src/qmlfileengine.cpp b/src/qmlfileengine.cpp
index 1656f42..223c75a 100644 (file)
--- a/src/qmlfileengine.cpp
+++ b/src/qmlfileengine.cpp
@@ -55,7 +55,7 @@ bool QmlFileEngine::open(QIODevice::OpenMode flags) {
     m_data = QByteArray::fromRawData((const char *)m_res->data(), m_res->size());
   }
 
-  m_data.replace("@IMPORT_QT_QUICK@", "import QtQuick 1.1");
+  m_data.replace("import QtQuick 2.0", "import QtQuick 1.1");
 
   return true;
 }