Commit 49ae4ec5 authored by Christian Kandeler's avatar Christian Kandeler
Browse files

Fix qbs build on Windows.



Change-Id: Idc471dd4a9734f71e615532a4d70225435452d27
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
parent 0b53638a
...@@ -24,6 +24,7 @@ DynamicLibrary { ...@@ -24,6 +24,7 @@ DynamicLibrary {
: ["$ORIGIN", "$ORIGIN/.."] : ["$ORIGIN", "$ORIGIN/.."]
property string libIncludeBase: ".." // #include <lib/header.h> property string libIncludeBase: ".." // #include <lib/header.h>
cpp.includePaths: [libIncludeBase] cpp.includePaths: [libIncludeBase]
cpp.minimumWindowsVersion: "5.1"
Export { Export {
Depends { name: "cpp" } Depends { name: "cpp" }
......
...@@ -36,6 +36,7 @@ Product { ...@@ -36,6 +36,7 @@ Product {
property string pluginIncludeBase: ".." // #include <plugin/header.h> property string pluginIncludeBase: ".." // #include <plugin/header.h>
cpp.includePaths: [pluginIncludeBase] cpp.includePaths: [pluginIncludeBase]
cpp.minimumWindowsVersion: "5.1"
Group { Group {
name: "PluginSpec" name: "PluginSpec"
......
...@@ -14,6 +14,7 @@ Application { ...@@ -14,6 +14,7 @@ Application {
cpp.rpaths: qbs.targetOS.contains("osx") cpp.rpaths: qbs.targetOS.contains("osx")
? ["@executable_path/../" + project.ide_library_path] ? ["@executable_path/../" + project.ide_library_path]
: ["$ORIGIN/../" + project.ide_library_path] : ["$ORIGIN/../" + project.ide_library_path]
cpp.minimumWindowsVersion: "5.1"
Group { Group {
fileTagsFilter: product.type fileTagsFilter: product.type
......
...@@ -11,7 +11,8 @@ QtcLibrary { ...@@ -11,7 +11,8 @@ QtcLibrary {
cpp.dynamicLibraries: [ cpp.dynamicLibraries: [
"user32", "user32",
"iphlpapi", "iphlpapi",
"ws2_32" "ws2_32",
"shell32",
] ]
} }
Properties { Properties {
......
...@@ -3,11 +3,27 @@ import "../../../autotest.qbs" as Autotest ...@@ -3,11 +3,27 @@ import "../../../autotest.qbs" as Autotest
Autotest { Autotest {
name: "QmlProjectManager file format autotest" name: "QmlProjectManager file format autotest"
Depends { name: "QmlProjectManager" } Depends { name: "QmlJS" }
Depends { name: "Utils" } Depends { name: "Utils" }
Depends { name: "Qt"; submodules: ["script", "declarative"]; } Depends { name: "Qt"; submodules: ["script", "declarative"]; }
Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
property path fileFormatDir: project.ide_source_tree + "/src/plugins/qmlprojectmanager/fileformat"
files: "tst_fileformat.cpp" files: "tst_fileformat.cpp"
cpp.includePaths: base.concat([project.ide_source_tree + "/src/plugins/qmlprojectmanager/fileformat"]) Group {
cpp.defines: base.concat(['SRCDIR="' + path + '"']) name: "Files from QmlProjectManager"
prefix: product.fileFormatDir + '/'
files: [
"filefilteritems.cpp",
"filefilteritems.h",
"qmlprojectfileformat.cpp",
"qmlprojectfileformat.h",
"qmlprojectitem.cpp",
"qmlprojectitem.h",
]
}
cpp.includePaths: base.concat([fileFormatDir])
cpp.defines: base.concat([
'QT_CREATOR',
'SRCDIR="' + path + '"'
])
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment