diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-10-18 13:39:47 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-10-18 13:39:47 +0200 |
| commit | 9bbafdb506dedb93b46ab578239354fcc7507eda (patch) | |
| tree | 3754f029250c08495fd2056f87814346690f631c /src/plugins/welcome | |
| parent | ce911e04c5eddc5bbbfdb49a731fb5e473b8b8ab (diff) | |
| parent | c89ffbe3ce6243fa98820923ada46e5c2572805a (diff) | |
| download | qt-creator-9bbafdb506dedb93b46ab578239354fcc7507eda.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
share/share.qbs
Change-Id: I2ab6080a8cc5315191b33c6df21a835df888a291
Diffstat (limited to 'src/plugins/welcome')
| -rw-r--r-- | src/plugins/welcome/welcome.pro | 7 | ||||
| -rw-r--r-- | src/plugins/welcome/welcome.qbs | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/plugins/welcome/welcome.pro b/src/plugins/welcome/welcome.pro index 57296515bf..482506916b 100644 --- a/src/plugins/welcome/welcome.pro +++ b/src/plugins/welcome/welcome.pro @@ -1,11 +1,6 @@ TEMPLATE = lib TARGET = Welcome -QT += network -greaterThan(QT_MAJOR_VERSION, 4) { - QT += quick1 -} else { - QT += declarative -} +QT += network declarative include(../../qtcreatorplugin.pri) include(welcome_dependencies.pri) diff --git a/src/plugins/welcome/welcome.qbs b/src/plugins/welcome/welcome.qbs index 3f4182aedf..a99fe82ab9 100644 --- a/src/plugins/welcome/welcome.qbs +++ b/src/plugins/welcome/welcome.qbs @@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin QtcPlugin { name: "Welcome" - Depends { name: "Qt"; submodules: ["widgets", "network", "quick1"] } + Depends { name: "Qt"; submodules: ["widgets", "network", "declarative"] } Depends { name: "Core" } Depends { name: "ProjectExplorer" } |