aboutsummaryrefslogtreecommitdiffstats
path: root/examples/cocoa-touch-application
Commit message (Collapse)AuthorAgeFilesLines
* Fix compiling with project.withExamples:true on MacIvan Komissarov2019-07-011-1/+3
| | | | | | | | | | | | | | | First, if qbs.targetPlatform is set, it is desired to use a corresponding architecture (armv7 or arm64); otherwise x86_64 architecture is used. Second, when building in Qt Creator, xcode module can't be found (due to different profile settings) and sysroot is not set to point to the iPhoneOS.sdk which leads to unability to find some frameworks. Disable this example when using QtC. Change-Id: I9fe413e6feb8fe7cfc6ff2e58323b81d8bf06839 Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Examples: explicitly set the target platform for the Apple onesJake Petroules2018-02-231-1/+3
| | | | | Change-Id: I8b31fc682a04f4d577eb2713f6e2af8519148800 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-261-1/+1
|\| | | | | | | Change-Id: I40c1ea23e7351deac715958783158c089e65a02d
| * Fix Info.plist variable expansion warning in example projectsJake Petroules2017-09-201-1/+1
| | | | | | | | | | | | | | | | 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-161-0/+7
| | | | | | | | | | | | | | | | 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>
* | Update the license headers of examplesJoerg Bornemann2017-08-034-68/+114
|/ | | | | | Change-Id: I29c6501e8afaa839beea94a44c03870ddd287367 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Fix Cocoa examplesJake Petroules2016-12-121-2/+6
| | | | | | | | 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-293-39/+69
| | | | | | | | | | 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 remote-tracking branch 'origin/1.5'Joerg Bornemann2016-06-089-9/+9
|\ | | | | | | | | | | | | | | 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-069-9/+9
| | | | | | | | | | | | Change-Id: I885d94bb14b325dc36767a840ebdb0be1fb59dd2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Remove items scheduled for removal in 1.6.Jake Petroules2016-04-221-4/+1
|/ | | | | Change-Id: I4098b281ab9c1f5bc29fe23164dd3a3303759ce0 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Deprecate bundle.infoPlistFile and start tagging Info.plist files.Jake Petroules2015-11-021-0/+2
| | | | | | | | 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>
* Use org.example instead of com.petroules in Info.plists.Jake Petroules2015-09-221-1/+1
| | | | | | | | 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>
* Merge branch '1.3' into 'master'Christian Kandeler2015-01-289-52/+52
|\ | | | | | | | | | | | | | | | | 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-269-52/+52
| | | | | | | | | | Change-Id: I092fca9f950de1ba38826c33b155f86feae2770b Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | Refactor bundle (CFBundle) support across all of Qbs.Jake Petroules2015-01-131-2/+1
|/ | | | | | | | | | | | | | | 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>
* License update.Eike Ziller2014-10-168-56/+64
| | | | | | | Add LGPLv3 option. Change-Id: I8a63ad5e46a2701032b2103f791df4dec5b707e8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Incremented year in copyright infoRobert Loehning2014-01-089-10/+10
| | | | | | Change-Id: Ib7f9a00bb891fa39c5bc1f891ddbfba1e4d23227 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Support :rfc1034identifier in Info.plist processing.Jake Petroules2013-12-022-9/+10
| | | | | | | | Example projects have been updated to test it. Task-number: QBS-465 Change-Id: I6e444512132293f7466e5f6372fdae12645c9db1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add iOS equivalent of CocoaApplication example.Jake Petroules2013-11-2219-0/+1847
Change-Id: I4f1ad74617d3326001d49e67e1de7e308ab12eff Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>