diff options
author | Jake Petroules <jake.petroules@qt.io> | 2017-08-15 16:49:20 -0700 |
---|---|---|
committer | Jake Petroules <jake.petroules@qt.io> | 2017-08-16 18:20:59 +0000 |
commit | 906d4085b43194633dbbcbd047916490dca1e23f (patch) | |
tree | 99bc85b5a84f9f4d026a92a0b4c1880a2e21d4c1 | |
parent | 89983bbd11aed13d2365daf41392a450afdd7b57 (diff) |
Make sure all files in the repository are shown in the Qbs project tree
This is helpful when working with IDEs because it enables Find functions
to work better, and avoids context switching to other editors.
Change-Id: I419ab440bd2b43eaf712b2cc498cc6c2d6d9e21b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r-- | doc/doc.qbs | 6 | ||||
-rw-r--r-- | examples/cocoa-application/app.qbs | 7 | ||||
-rw-r--r-- | examples/cocoa-touch-application/CocoaTouchApplication.qbs | 7 | ||||
-rw-r--r-- | examples/collidingmice/collidingmice.qbs | 1 | ||||
-rw-r--r-- | examples/compiled-qml/myapp.qbs | 1 | ||||
-rw-r--r-- | examples/examples.qbs | 1 | ||||
-rw-r--r-- | qbs.qbs | 2 | ||||
-rw-r--r-- | src/app/qbs-setup-qt/qbs-setup-qt.qbs | 2 |
8 files changed, 25 insertions, 2 deletions
diff --git a/doc/doc.qbs b/doc/doc.qbs index 1dba7dae9..2a0e16587 100644 --- a/doc/doc.qbs +++ b/doc/doc.qbs @@ -9,11 +9,17 @@ Product { Depends { name: "qbsversion" } files: [ + "../README", + "classic.css", "external-resources.qdoc", + "fixnavi.pl", "howtos.qdoc", "qbs.qdoc", + "qbs-online.qdocconf", "config/*.qdocconf", + "config/style/qt5-sidebar.html", "reference/**/*", + "templates/**/*", ] Group { name: "main qdocconf file" diff --git a/examples/cocoa-application/app.qbs b/examples/cocoa-application/app.qbs index 251c02383..6416435c0 100644 --- a/examples/cocoa-application/app.qbs +++ b/examples/cocoa-application/app.qbs @@ -81,6 +81,13 @@ CppApplication { } Group { + name: "Xcode Project" + files: [ + "CocoaApplication.xcodeproj/project.pbxproj" + ] + } + + Group { files: ["CocoaApplication/CocoaApplication-Prefix.pch"] fileTags: ["objc_pch_src"] } diff --git a/examples/cocoa-touch-application/CocoaTouchApplication.qbs b/examples/cocoa-touch-application/CocoaTouchApplication.qbs index 3c24e1ed7..b0bdf2446 100644 --- a/examples/cocoa-touch-application/CocoaTouchApplication.qbs +++ b/examples/cocoa-touch-application/CocoaTouchApplication.qbs @@ -90,6 +90,13 @@ CppApplication { } Group { + name: "Xcode Project" + files: [ + "CocoaTouchApplication.xcodeproj/project.pbxproj" + ] + } + + Group { files: ["CocoaTouchApplication/CocoaTouchApplication-Prefix.pch"] fileTags: ["objc_pch_src"] } diff --git a/examples/collidingmice/collidingmice.qbs b/examples/collidingmice/collidingmice.qbs index d23269087..0b06eff2c 100644 --- a/examples/collidingmice/collidingmice.qbs +++ b/examples/collidingmice/collidingmice.qbs @@ -60,6 +60,7 @@ Application { } files : [ + "images/cheese.jpg", "main.cpp", "mouse.cpp", "mouse.h", diff --git a/examples/compiled-qml/myapp.qbs b/examples/compiled-qml/myapp.qbs index f2b04ec83..3a900fac9 100644 --- a/examples/compiled-qml/myapp.qbs +++ b/examples/compiled-qml/myapp.qbs @@ -54,6 +54,7 @@ CppApplication { Depends { name: "Qt.quick" } files: [ + "cheese.jpg", "main.cpp", "qml.qrc" ] diff --git a/examples/examples.qbs b/examples/examples.qbs index 28dddcd2c..0e4e5052c 100644 --- a/examples/examples.qbs +++ b/examples/examples.qbs @@ -57,6 +57,7 @@ Project { "cocoa-touch-application/CocoaTouchApplication.qbs", "code-generator/code-generator.qbs", "collidingmice/collidingmice.qbs", + "compiled-qml/myapp.qbs", "helloworld-complex/hello.qbs", "helloworld-minimal/hello.qbs", "helloworld-qt/hello.qbs", @@ -30,7 +30,7 @@ Project { Product { name: "qmake project files for qbs" - files: ["**/*.pr[io]"] + files: ["**/*.pr[io]", "sync.profile"] } AutotestRunner { diff --git a/src/app/qbs-setup-qt/qbs-setup-qt.qbs b/src/app/qbs-setup-qt/qbs-setup-qt.qbs index 033f046a5..8bd4ae263 100644 --- a/src/app/qbs-setup-qt/qbs-setup-qt.qbs +++ b/src/app/qbs-setup-qt/qbs-setup-qt.qbs @@ -13,7 +13,7 @@ QbsApp { Group { name: "MinGW specific files" condition: qbs.toolchain.contains("mingw") - files: ["qbs-setup-qt.rc"] + files: ["qbs-setup-qt.exe.manifest", "qbs-setup-qt.rc"] } } |