forked from qt-creator/qt-creator
qbs files: build with Qt5
Help plugin and QmlDesigner have been disabled for Qt5. Change-Id: I9345d0fd00f9a575333dc972cc7adbdf146cd6cb Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
This commit is contained in:
@@ -18,7 +18,7 @@ QtcLibrary {
|
||||
}
|
||||
|
||||
Depends { name: "cpp" }
|
||||
Depends { name: "Qt"; submodules: ['widgets', 'network', 'script'] }
|
||||
Depends { name: "Qt"; submodules: ['widgets', 'network', 'script', 'concurrent'] }
|
||||
Depends { name: "Botan" }
|
||||
Depends { name: "app_version_header" }
|
||||
|
||||
@@ -253,5 +253,9 @@ QtcLibrary {
|
||||
"unixutils.cpp"
|
||||
]
|
||||
}
|
||||
|
||||
ProductModule {
|
||||
Depends { name: "Qt"; submodules: ["concurrent"] }
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -4,7 +4,13 @@ import "../QtcPlugin.qbs" as QtcPlugin
|
||||
QtcPlugin {
|
||||
name: "Core"
|
||||
|
||||
Depends { name: "qt"; submodules: ['core', 'widgets', 'xml', 'network', 'script', 'sql', 'help'] }
|
||||
Depends {
|
||||
name: "qt"
|
||||
submodules: [
|
||||
'core', 'widgets', 'xml', 'network',
|
||||
'script', 'sql', 'help', 'printsupport'
|
||||
]
|
||||
}
|
||||
Depends { name: "Utils" }
|
||||
Depends { name: "ExtensionSystem" }
|
||||
Depends { name: "Aggregation" }
|
||||
|
@@ -5,6 +5,8 @@ import "../QtcPlugin.qbs" as QtcPlugin
|
||||
QtcPlugin {
|
||||
name: "Help"
|
||||
|
||||
condition: qtcore.versionMajor === 4
|
||||
Depends { id: qtcore; name: "qt.core" }
|
||||
Depends { name: "qt"; submodules: ['widgets', 'help', 'webkit'] }
|
||||
Depends { name: "Core" }
|
||||
Depends { name: "Find" }
|
||||
|
@@ -5,6 +5,8 @@ import "../QtcPlugin.qbs" as QtcPlugin
|
||||
QtcPlugin {
|
||||
name: "QmlDesigner"
|
||||
|
||||
condition: qtcore.versionMajor === 4
|
||||
Depends { id: qtcore; name: "qt.core" }
|
||||
Depends { name: "qt"; submodules: ['widgets', 'quick1'] }
|
||||
Depends { name: "Core" }
|
||||
Depends { name: "QmlJS" }
|
||||
|
Reference in New Issue
Block a user