diff --git a/qtcreator.pri b/qtcreator.pri index fcf61a5cef2d265b6a7726319708a374f9f65e1d..79aa849a7ab6b9a966920e01644c047a8955428c 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -157,5 +157,4 @@ win32-msvc* { qt:greaterThan(QT_MAJOR_VERSION, 4) { contains(QT, core): QT += concurrent contains(QT, gui): QT += widgets - contains(QT, declarative): QT += quick1 } diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets.pri b/src/libs/qmleditorwidgets/qmleditorwidgets.pri index 55a4c3da0ad6196f08182d853a2590cd2eb01e04..4a2788cf3a8a1147aefb43ebe51887d957382bee 100644 --- a/src/libs/qmleditorwidgets/qmleditorwidgets.pri +++ b/src/libs/qmleditorwidgets/qmleditorwidgets.pri @@ -1,5 +1,9 @@ INCLUDEPATH += $$PWD $$PWD/easingpane -QT += declarative +greaterThan(QT_MAJOR_VERSION, 4) { + QT += quick1 +} else { + QT += declarative +} LIBS *= -l$$qtLibraryName(QmlEditorWidgets) diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index e1058767cd9620ac0fdcfdb0569d6c086ee8e544..a05b953f7ff7c755845aa3b3a8b9dccfe5ea23f2 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -58,7 +58,7 @@ linux-* { include(../../qtcreator.pri) -contains(QT_CONFIG, declarative) { +contains(QT_CONFIG, declarative)|contains(QT_CONFIG, quick1) { SUBDIRS += \ plugin_qmlprojectmanager \ plugin_qmljsinspector @@ -311,4 +311,4 @@ plugin_todo.subdir = todo plugin_todo.depends = plugin_coreplugin plugin_todo.depends += plugin_projectexplorer plugin_todo.depends += plugin_texteditor -plugin_todo.depends += plugin_cpptools \ No newline at end of file +plugin_todo.depends += plugin_cpptools diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro index 39581e7289dfc904abd3f5ac7ac895c65cf74497..1727a93388d4e29233c48898bcb4e335b87deab4 100644 --- a/src/plugins/projectexplorer/projectexplorer.pro +++ b/src/plugins/projectexplorer/projectexplorer.pro @@ -1,8 +1,11 @@ TEMPLATE = lib TARGET = ProjectExplorer -QT += xml \ - script \ - declarative +QT += xml script +greaterThan(QT_MAJOR_VERSION, 4) { + QT += quick1 +} else { + QT += declarative +} include(../../qtcreatorplugin.pri) include(projectexplorer_dependencies.pri) diff --git a/src/plugins/qmljsinspector/qmljsinspector.pro b/src/plugins/qmljsinspector/qmljsinspector.pro index 5d39cfa5e00554f8c2711d29add7478c5e694f90..fe64d757eaa1ea885c47f37f8671a48696c971ab 100644 --- a/src/plugins/qmljsinspector/qmljsinspector.pro +++ b/src/plugins/qmljsinspector/qmljsinspector.pro @@ -2,7 +2,12 @@ TEMPLATE = lib TARGET = QmlJSInspector INCLUDEPATH += . DEPENDPATH += . -QT += declarative network +QT += network +greaterThan(QT_MAJOR_VERSION, 4) { + QT += quick1 +} else { + QT += declarative +} DEFINES += QMLJSINSPECTOR_LIBRARY diff --git a/src/plugins/qmlprofiler/qmlprofiler.pro b/src/plugins/qmlprofiler/qmlprofiler.pro index 2f41d50db1386b4282466230b43449a723b3b177..7403b1fb68aba82b6fc49d4e23a89b2b10f301ee 100644 --- a/src/plugins/qmlprofiler/qmlprofiler.pro +++ b/src/plugins/qmlprofiler/qmlprofiler.pro @@ -3,7 +3,12 @@ TARGET = QmlProfiler DEFINES += PROFILER_LIBRARY -QT += network script declarative +QT += network script +greaterThan(QT_MAJOR_VERSION, 4) { + QT += quick1 +} else { + QT += declarative +} include(../../qtcreatorplugin.pri) include(../../plugins/coreplugin/coreplugin.pri) diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.pro b/src/plugins/qmlprojectmanager/qmlprojectmanager.pro index 4885be0441e3ff737c10f0dbbee12f2955c41c3b..cd40ae3e2f5bdb8acfb27b680535e886a2e0b611 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectmanager.pro +++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.pro @@ -1,7 +1,12 @@ TEMPLATE = lib TARGET = QmlProjectManager -QT += declarative network +QT += network +greaterThan(QT_MAJOR_VERSION, 4) { + QT += quick1 +} else { + QT += declarative +} include(../../qtcreatorplugin.pri) include(qmlprojectmanager_dependencies.pri) diff --git a/src/plugins/qtsupport/qtsupport.pro b/src/plugins/qtsupport/qtsupport.pro index 088a61e7d0f0bb3e07e9b5242e2b9fc3b13350b9..383c154a428e0e70d00cd6606651d6bba239908d 100644 --- a/src/plugins/qtsupport/qtsupport.pro +++ b/src/plugins/qtsupport/qtsupport.pro @@ -1,7 +1,13 @@ TEMPLATE = lib TARGET = QtSupport DEFINES += QT_CREATOR QTSUPPORT_LIBRARY -QT += network declarative +QT += network +greaterThan(QT_MAJOR_VERSION, 4) { + QT += quick1 +} else { + QT += declarative +} + include(../../qtcreatorplugin.pri) include(qtsupport_dependencies.pri) DEFINES += \ diff --git a/src/plugins/welcome/welcome.pro b/src/plugins/welcome/welcome.pro index 482506916b048951a0363466e111fcbd8ca70a43..57296515bf10a353887dd31bdbab2c960ef8d4f4 100644 --- a/src/plugins/welcome/welcome.pro +++ b/src/plugins/welcome/welcome.pro @@ -1,6 +1,11 @@ TEMPLATE = lib TARGET = Welcome -QT += network declarative +QT += network +greaterThan(QT_MAJOR_VERSION, 4) { + QT += quick1 +} else { + QT += declarative +} include(../../qtcreatorplugin.pri) include(welcome_dependencies.pri)