diff --git a/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.pri index 567c6dc..830526b 100644 --- a/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.pri +++ b/demos/qmlaxes/qmlapplicationviewer/qmlapplicationviewer.pri @@ -1,4 +1,8 @@ -QT += declarative +greaterThan(QT_MAJOR_VERSION, 4) { + QT += quick1 +} else { + QT += declarative +} SOURCES += $$PWD/qmlapplicationviewer.cpp HEADERS += $$PWD/qmlapplicationviewer.h diff --git a/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri index 567c6dc..830526b 100644 --- a/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri +++ b/demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri @@ -1,4 +1,8 @@ -QT += declarative +greaterThan(QT_MAJOR_VERSION, 4) { + QT += quick1 +} else { + QT += declarative +} SOURCES += $$PWD/qmlapplicationviewer.cpp HEADERS += $$PWD/qmlapplicationviewer.h diff --git a/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.pri index 567c6dc..830526b 100644 --- a/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.pri +++ b/demos/qmlcustomizations/qmlapplicationviewer/qmlapplicationviewer.pri @@ -1,4 +1,8 @@ -QT += declarative +greaterThan(QT_MAJOR_VERSION, 4) { + QT += quick1 +} else { + QT += declarative +} SOURCES += $$PWD/qmlapplicationviewer.cpp HEADERS += $$PWD/qmlapplicationviewer.h diff --git a/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.pri index 567c6dc..830526b 100644 --- a/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.pri +++ b/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.pri @@ -1,4 +1,8 @@ -QT += declarative +greaterThan(QT_MAJOR_VERSION, 4) { + QT += quick1 +} else { + QT += declarative +} SOURCES += $$PWD/qmlapplicationviewer.cpp HEADERS += $$PWD/qmlapplicationviewer.h diff --git a/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.pri index b6931d0..40bf295 100644 --- a/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.pri +++ b/demos/qmlf1legends/qmlapplicationviewer/qmlapplicationviewer.pri @@ -5,7 +5,11 @@ # It is recommended not to modify this file, since newer versions of Qt Creator # may offer an updated version of it. -QT += declarative +greaterThan(QT_MAJOR_VERSION, 4) { + QT += quick1 +} else { + QT += declarative +} SOURCES += $$PWD/qmlapplicationviewer.cpp HEADERS += $$PWD/qmlapplicationviewer.h diff --git a/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.pri index 567c6dc..830526b 100644 --- a/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.pri +++ b/demos/qmloscilloscope/qmlapplicationviewer/qmlapplicationviewer.pri @@ -1,4 +1,8 @@ -QT += declarative +greaterThan(QT_MAJOR_VERSION, 4) { + QT += quick1 +} else { + QT += declarative +} SOURCES += $$PWD/qmlapplicationviewer.cpp HEADERS += $$PWD/qmlapplicationviewer.h diff --git a/demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.pri index b6931d0..40bf295 100644 --- a/demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.pri +++ b/demos/qmlweather/qmlapplicationviewer/qmlapplicationviewer.pri @@ -5,7 +5,11 @@ # It is recommended not to modify this file, since newer versions of Qt Creator # may offer an updated version of it. -QT += declarative +greaterThan(QT_MAJOR_VERSION, 4) { + QT += quick1 +} else { + QT += declarative +} SOURCES += $$PWD/qmlapplicationviewer.cpp HEADERS += $$PWD/qmlapplicationviewer.h diff --git a/examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.pri b/examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.pri index 567c6dc..830526b 100644 --- a/examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.pri +++ b/examples/qmlpiechart/qmlapplicationviewer/qmlapplicationviewer.pri @@ -1,4 +1,8 @@ -QT += declarative +greaterThan(QT_MAJOR_VERSION, 4) { + QT += quick1 +} else { + QT += declarative +} SOURCES += $$PWD/qmlapplicationviewer.cpp HEADERS += $$PWD/qmlapplicationviewer.h diff --git a/plugins/declarative/declarative.pro b/plugins/declarative/declarative.pro index 68fd278..1269fd3 100644 --- a/plugins/declarative/declarative.pro +++ b/plugins/declarative/declarative.pro @@ -3,7 +3,11 @@ } TARGET = qtcommercialchartqml -QT += declarative +greaterThan(QT_MAJOR_VERSION, 4) { + QT += quick1 +} else { + QT += declarative +} DESTDIR = $$CHART_BUILD_QML_PLUGIN_DIR INCLUDEPATH += $$CHART_BUILD_PRIVATE_HEADER_DIR diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro index 144e5db..37397ab 100644 --- a/tests/auto/qml/qml.pro +++ b/tests/auto/qml/qml.pro @@ -2,4 +2,8 @@ error( "Couldn't find the auto.pri file!" ) } SOURCES += tst_qml.cpp -QT += declarative +greaterThan(QT_MAJOR_VERSION, 4) { + QT += quick1 +} else { + QT += declarative +} diff --git a/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.pri b/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.pri index 567c6dc..830526b 100644 --- a/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.pri +++ b/tests/qmlchartaxis/qmlapplicationviewer/qmlapplicationviewer.pri @@ -1,4 +1,8 @@ -QT += declarative +greaterThan(QT_MAJOR_VERSION, 4) { + QT += quick1 +} else { + QT += declarative +} SOURCES += $$PWD/qmlapplicationviewer.cpp HEADERS += $$PWD/qmlapplicationviewer.h diff --git a/tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.pri b/tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.pri index 567c6dc..830526b 100644 --- a/tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.pri +++ b/tests/qmlchartproperties/qmlapplicationviewer/qmlapplicationviewer.pri @@ -1,4 +1,8 @@ -QT += declarative +greaterThan(QT_MAJOR_VERSION, 4) { + QT += quick1 +} else { + QT += declarative +} SOURCES += $$PWD/qmlapplicationviewer.cpp HEADERS += $$PWD/qmlapplicationviewer.h