feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	share/share.qbs

Change-Id: I2ab6080a8cc5315191b33c6df21a835df888a291
This commit is contained in:
Eike Ziller
2012-10-18 13:39:47 +02:00
parent ce911e04c5 c89ffbe3ce
commit 9bbafdb506
24 changed files with 27 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qmlprofiler/qmlprofiler.pro
View File

@@ -3,12 +3,7 @@ TARGET = QmlProfiler
DEFINES += QMLPROFILER_LIBRARY
QT += network script
greaterThan(QT_MAJOR_VERSION, 4) {
QT += quick1
} else {
QT += declarative
}
QT += network script declarative
include(../../qtcreatorplugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)

2
src/plugins/qmlprofiler/qmlprofiler.qbs
View File

@@ -5,7 +5,7 @@ import "../QtcPlugin.qbs" as QtcPlugin
QtcPlugin {
name: "QmlProfiler"
Depends { name: "Qt"; submodules: ["widgets", "network", "script", "quick1"] }
Depends { name: "Qt"; submodules: ["widgets", "network", "script", "declarative"] }
Depends { name: "Core" }
Depends { name: "AnalyzerBase" }
Depends { name: "QmlProjectManager" }