aboutsummaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Use 'const auto' keywords more at objects allocationsDenis Shienkov2019-02-231-1/+1
| | | | | | Change-Id: I592d433e7c473ae9f27ca08e701516efe53650ba Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add protobuf.cpp and protobuf.objc modulesIvan Komissarov2018-11-228-0/+446
| | | | | | | | | | | These modules implement google protobuf support for QBS for c++ and objective-c languages [ChangeLog] Added protobuf support for C++ and Objective-C. Fixes: QBS-563 Change-Id: I4bb7e0bdfc1e09ea26c0cd3d3739a741ff834e5d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix the "colliding mice" example on non-Darwin platformsChristian Kandeler2018-11-161-2/+3
| | | | | | | | The bundle module is no longer pulled in unconditionally. This amends 67c0107214. Change-Id: I08dd40a4e007474a7737ed17f1a1db2cee633cef Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Merge 1.11 into masterChristian Kandeler2018-02-232-2/+4
|\ | | | | | | Change-Id: Ic3e40083dcec6421fb5b55e8a4ccba7b49298c54
| * Examples: explicitly set the target platform for the Apple onesJake Petroules2018-02-232-2/+4
| | | | | | | | | | Change-Id: I8b31fc682a04f4d577eb2713f6e2af8519148800 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Use 'auto' keywords more for the allocated variablesDenis Shienkov2018-01-231-1/+1
|/ | | | | Change-Id: I25ec97e64522d7fa486fcf408d8134cbbd8b24ea Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Replace 'foreach' macro with range-based 'for'Denis Shienkov2017-11-241-2/+2
| | | | | Change-Id: I34479bc9673d0202363aeba5c7919efc8f0d7287 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Rename CoreUtils in install-bundle exampleJake Petroules2017-11-131-3/+3
| | | | | | | That name conflicts with an Apple system framework. Change-Id: I9d8c1f3fdff813341e433578e4e48aac607a1e39 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Polish examples/collidingmiceJoerg Bornemann2017-10-171-8/+7
| | | | | | | | Use proper installation instead of destinationDirectory, and use a simpler style for the Qt.widgets dependency. Change-Id: I3dbed37c55e9064b0497c03933536ffcbc224cd7 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Polish examples/app-and-libJoerg Bornemann2017-10-173-4/+5
| | | | | | | | | Assign sensible names to the products, fix the style of the project files and add some more descriptive output. Change-Id: Icdca5e8c32cfef767aa18abc2dd9c4688880c2ba Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge 1.9 into masterChristian Kandeler2017-10-052-3/+3
|\ | | | | | | | | | | This is intended to be the last merge from 1.9. Change-Id: I7b9dec70a50726f4ed2d54152eab472f2c6b74ec
| * Increase the iOS example app's deployment target to 8.0Jake Petroules2017-10-042-3/+3
| | | | | | | | | | | | | | | | The latest verion of Xcode isn't even capable of building storyboards for iOS 6.1 anymore. Change-Id: I72efdf2558eb03394ce89efd8a95eb1a4eb706d7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge remote-tracking branch 'origin/1.9'Joerg Bornemann2017-09-264-3/+4
|\| | | | | | | Change-Id: I40c1ea23e7351deac715958783158c089e65a02d
| * Fix broken deployment target handling in install-bundle exampleJake Petroules2017-09-202-1/+2
| | | | | | | | | | | | | | This fixes a build error with Xcode 9, which is more strict. Change-Id: I10f67655ba525ffa909319b43c713947a55a9c7b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Fix Info.plist variable expansion warning in example projectsJake Petroules2017-09-202-2/+2
| | | | | | | | | | | | | | | | We match the minimum deployment target values of macOS 10.8 and iOS 6.1 from the corresponding Xcode projects present alongside each example. Change-Id: Ideacac6cc8b58cf70baa22d5246b282ae0686d33 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Make sure all files in the repository are shown in the Qbs project treeJake Petroules2017-08-165-0/+17
| | | | | | | | | | | | | | | | 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>
* | Merge 1.9 into masterChristian Kandeler2017-08-142-7/+9
|\| | | | | | | Change-Id: I6da76b0a53bf87105c4e7b48724d9760cb68e831
| * Do not access the bundle module unconditionallyChristian Kandeler2017-08-022-7/+9
| | | | | | | | | | | | | | | | | | | | It is a mistake that the NativeBinary item currently pulls in the bundle module unconditionally (and also that the module is enabled everywhere). We want to change that. Prepare for the change by removing all unconditional accesses to the module's properties. Change-Id: If57b8222c1a0e2b09c33520882446fa71401f1f1 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Update the license headers of examplesJoerg Bornemann2017-08-0334-275/+543
| | | | | | | | | | | | Change-Id: I29c6501e8afaa839beea94a44c03870ddd287367 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Add support for the Qt Quick compilerJoerg Bornemann2017-08-036-0/+264
|/ | | | | | | | | | | | | | | | | | | | | Detect the availability of the Qt Quick compiler in qbs-setup-qt. Add a property bool Qt.quick.compilerAvailable that is true if the Qt Quick compiler is available in this Qt build. If the compiler is available, create an extended Qt.quick module with Qt Quick compiler rules. Create a standard module otherwise. The rules pick up Qt resource files tagged with Qt.quick.qrc and compile the referenced QML files. The remaining files are put into a new QRC file that is then passed to rcc. A prioritized file tagger is provided that automatically tags *.qrc files as "qt.quick.qrc" if the Qt quick compiler is available. [ChangeLog] Added support for the Qt Quick compiler. Task-number: QBS-749 Change-Id: I44e490e09796afeb5455ec50abc1e798f7eaf01a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add support for building macOS disk imagesJake Petroules2017-06-1228-32/+262
| | | | | | | | | | | | | | | | This allows users to build drag 'n' drop installers with custom backgrounds, volume icons, and icon layouts. Unlike other solutions, disk images with these features can be built without any reliance on AppleScript, Finder, or a graphical login session, making it (mostly) reproducible and CI-friendly. .DS_Store files and their contained alias and bookmark records (which control the mounted disk image's appearance in the Finder) are written on-demand based on qbs properties defined in the project file, as well as the Carbon LPic, TEXT, styl, and RTF resources used for embedding a license agreement prompt. Task-number: QBS-416 Change-Id: I95431e21becc3bea075a1468d5271a41c38bbd04 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix race condition in code-generator exampleChristian Kandeler2017-04-031-8/+2
| | | | | Change-Id: I2adade1855de34adbe9c0c9629427c706621936b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Attach the bundle.content file tag to files that are part of a bundleJake Petroules2017-02-0811-31/+794
| | | | | | | | | | | | | This simplifies installation for end users, as they only ever have to use this one tag to install an entire bundle, rather than having to remember every possible file tag attached to the output artifacts of rules which install their output to a bundle. Refactor associated rules to handle this new internal workflow. This paves the way for other new functionality like bundle embedding. Change-Id: I76369383ae08d1ff5433b73d517a657dbd329b78 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix Cocoa examplesJake Petroules2016-12-123-4/+13
| | | | | | | | cpp.precompiledHeader no longer exists, and the iOS app was missing from the examples qbs file. Change-Id: I2e5f662fb28f6fcd0e4554866eb8828ca1be08ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Update license headersIikka Eklund2016-08-2912-98/+393
| | | | | | | | | | Patch-set 2 includes *.cpp *.c Every source file needs to have up-to-date license headers in order to pass ci. Change-Id: Ie6e493097af6f7dd6a8adff170eb856f496e689e Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Update license headersIikka Eklund2016-08-299-66/+271
| | | | | | | | | | Patch-set 1 includes *.h Every source file needs to have up-to-date license headers in order to pass ci. Change-Id: Ib6cf3ac47dfba6dff262fded44bc952aef3bda8b Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Merge 1.5 into 1.6Jake Petroules2016-06-281-1/+1
|\ | | | | | | Change-Id: If1a2c368170d89d5e6e11b08a32b37901d51eb1d
| * Do the OS X to macOS rename.v1.5.2Jake Petroules2016-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog] The "osx" value in qbs.hostOS and qbs.targetOS has been replaced with "macos". For backwards compatibility, qbs.hostOS will still contain "osx" in addition to "macos", and an error will be printed if qbs.targetOS contains "osx" but not "macos". Specifying "macos" without "osx" is allowed. These checks are subject to be removed in a future version of qbs, so update your hostOS and targetOS checks accordingly. [ChangeLog] cpp.minimumOsxVersion has been deprecated and replaced with cpp.minimumMacosVersion. cpp.minimumOsxVersion is subject to be removed in a future version of qbs, so update your projects accordingly. Change-Id: I479891829dff6eb6750cb2a04e1395f085896f63 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Merge remote-tracking branch 'origin/1.5'Joerg Bornemann2016-06-0833-33/+33
|\| | | | | | | | | | | | | | | Conflicts: doc/reference/items/transformer.qdoc share/qbs/modules/cpp/GenericGCC.qbs Change-Id: I45560834560019b18274c373c45651eb8aadd206
| * Replace 'the Qt build suite' with 'Qbs' in copyright notices.Jake Petroules2016-06-0633-33/+33
| | | | | | | | | | | | Change-Id: I885d94bb14b325dc36767a840ebdb0be1fb59dd2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Use Qt5-style connectsOrgad Shaneh2016-06-071-1/+1
| | | | | | | | | | | | | | The heavy lifting was done by clazy. Change-Id: Ibb13c517567b1b32bbda6d26225454d1b003934d Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | Remove items scheduled for removal in 1.6.Jake Petroules2016-04-222-8/+2
|/ | | | | Change-Id: I4098b281ab9c1f5bc29fe23164dd3a3303759ce0 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Deprecate bundle.infoPlistFile and start tagging Info.plist files.Jake Petroules2015-11-023-2/+6
| | | | | | | | This ensures that artifacts will be appropriately rebuilt if the product's Info.plist file changes, which is currently ignored. Change-Id: I3adf7e74bd32f3bb8d3084061dd2793aa02b932c Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Merge branch 1.4 into master.Christian Kandeler2015-10-261-4/+3
|\ | | | | | | Change-Id: I45ee8897a07522c51833739afc8de374ec269e08
| * fix examples/code-generatorJoerg Bornemann2015-09-111-4/+3
| | | | | | | | | | | | | | This example did nothing since commit c91dcd35. Change-Id: I7aa440272b2499e26bc947e9b973682a82ca2b75 Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
* | Use org.example instead of com.petroules in Info.plists.Jake Petroules2015-09-222-2/+2
|/ | | | | | | | This makes sure the Qbs and Xcode builds will generate the same CFBundleIdentifier, which will be important for code signing. Change-Id: Ic877e98b89d50f996e9a603791fa16646ca0f7d3 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Don't advertise using relative paths in export items.Christian Kandeler2015-07-281-1/+1
| | | | | | | | While we do support this for compatibility reasons, let's not encourage it. Change-Id: I4856b021b2e309e35974af68fe4dc10954d3d451 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix installed bundle example to work well on Windows.Jake Petroules2015-05-043-4/+9
| | | | | Change-Id: I382a6a91f41dab1dc9ff8769c4875b6d2f050520 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Add an example demonstrating how to properly install bundle products.Jake Petroules2015-05-045-0/+73
| | | | | Change-Id: Iee310389b2c64f5c2b1df1ad59f3260a2fa294f6 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* update license headersJoerg Bornemann2015-03-021-3/+3
| | | | | Change-Id: I36d825db3a5ef32c162c3063aab1e8a1f2696f4f Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Merge branch '1.3' into 'master'Christian Kandeler2015-01-2832-149/+149
|\ | | | | | | | | | | | | | | | | Conflicts: doc/reference/jsextensions/jsextensions-general.qdoc src/lib/corelib/language/evaluatorscriptclass.cpp src/lib/corelib/language/evaluatorscriptclass.h Change-Id: Ic9b77b56e8fc8bf93e0a553930757de8c93fed22
| * Update LicenseEike Ziller2015-01-2632-149/+149
| | | | | | | | | | Change-Id: I092fca9f950de1ba38826c33b155f86feae2770b Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | Refactor bundle (CFBundle) support across all of Qbs.Jake Petroules2015-01-134-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the foundation for better bundle support, including static frameworks, loadable modules ("bundles" i.e. plugins), and custom bundle types. This also simplifies the difference between bundle and non-bundle product types from a Qbs user's perspective, and allows more fine-grained control over the construction of and use of bundles. This patch also implicitly adds support for static frameworks. Task-number: QBS-643 Task-number: QBS-642 Change-Id: I65d8d7040603a6ea0ff2c11360234eba6802ad35 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | use standard pattern for exporting "." include pathsJoerg Bornemann2015-01-121-1/+1
| | | | | | | | | | | | | | The magic path variable is not needed here. Change-Id: Ie0fcd2b3310cbc36375df5c96bd490a6db5dba43 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | Improve the "app and lib" example.Christian Kandeler2015-01-073-3/+16
| | | | | | | | | | | | | | | | Make it more realistic by giving the library a header file, so the example can demonstrate how to export an include path. Change-Id: I4b55af8b86ef4fa0cddc3f29cefc5054e82c88cf Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | fix code-generator example for OS XJoerg Bornemann2014-12-031-2/+6
| | | | | | | | | | Change-Id: Idabbb14777cae50854d8cf3db9894fdff6bc095a Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | add code generator exampleJoerg Bornemann2014-12-023-0/+86
|/ | | | | Change-Id: I78c2aec4466499871bc03b7ca35a38086a1fb548 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* License update.Eike Ziller2014-10-1617-119/+136
| | | | | | | Add LGPLv3 option. Change-Id: I8a63ad5e46a2701032b2103f791df4dec5b707e8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add and make use of convenience item QtGuiApplication.Christian Kandeler2014-07-141-2/+1
| | | | | | | | | | Using this item, building a Qt gui app against a static Qt will work out of the box. Also add the less useful QtApplication for completeness. Change-Id: Idca1dbd3085659ebaf563f7df89f73b9daaf7001 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Remove trailing whitespaceOrgad Shaneh2014-05-211-1/+1
| | | | | Change-Id: Id4a8bbc1d7656f3367e43f16fb8ee5a930d78d39 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>