aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Remove unused overload of ModuleLoader::productModuleJoerg Bornemann2017-10-062-8/+0
| | | | | Change-Id: I62651b2baf2497d11d78554fc84ad0cfbf178f33 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Get rid of the ".obj" subdir in our build directoriesJoerg Bornemann2017-10-067-19/+18
| | | | | | | | | | | We claim that build directories are opaque, yet there's a ".obj" subdir where object files are placed. This needlessly adds a level in the build dir structure. Remove the creation and usage of this directory, which is clearly qmake legacy. Change-Id: I3afa6bd61b76941ecebbc2cd8f4109621694e371 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Improve error message for missing build graphChristian Kandeler2017-10-064-5/+41
| | | | | | | | | We now print the name of the configuration (as it could be implicit), and also where we tried to locate the build graph. Both of these can help users figure out what the problem is. Change-Id: Ia5ee014756081cf708f02b3c367fc9f817966d9f Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Merge "Merge 1.9 into master"Jake Petroules2017-10-058-11/+47
|\
| * Merge 1.9 into masterChristian Kandeler2017-10-058-11/+47
| |\ | | | | | | | | | | | | | | | This is intended to be the last merge from 1.9. Change-Id: I7b9dec70a50726f4ed2d54152eab472f2c6b74ec
| | * Add changelog file for 1.9.11.9Christian Kandeler2017-10-051-0/+4
| | | | | | | | | | | | | | | | | | | | | Better late than never. Change-Id: I06550e060a3fd24ca7be0f21980b9f5dd9cef0c7 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| | * Fix usage of outer within Properties blocksJoerg Bornemann2017-10-045-9/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In EvaluatorScriptClass we're cloning the value that's referenced by "outer" and leave out the list of alternatives. This custom cloning code was missing the defining item of JSSourceValue, which led to an error if the outer item was dependent on some other property. Now, we create a full clone and clear the necessary members. This ensures we do not have to adjust this code if another member is added to JSSourceValue. Task-number: QBS-1205 Change-Id: I59596894f365fa5207490922ee60959e221102b1 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * 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>
* | | Doc: How to apply C/C++ preprocessor macros to a subset of product filesLeena Miettinen2017-10-051-0/+45
| | | | | | | | | | | | | | | Change-Id: I0b78fbd42521af825ff39a5d7ed6aa6c1a1a7a70 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | | Doc: Add a how-to for creating modules for 3rd party librariesLeena Miettinen2017-10-051-0/+56
| | | | | | | | | | | | | | | | | | | | | Task-number: QBS-1191 Change-Id: I63199bc85bed43841e97908fcff0268211ba86c0 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | | CLI: Ensure "restore only" mode for commands that don't support -fChristian Kandeler2017-10-055-5/+13
|/ / | | | | | | | | | | | | This is now guaranteed programatically. Change-Id: Ifda974aa9347801ccf9e8b04f150cdf2368a756e Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Remove pointless option for update-timestamps commandChristian Kandeler2017-10-053-5/+4
| | | | | | | | | | | | | | Also fix help output and CLI documentation. Change-Id: I45229809ea2f088628f1b512200fe3c8e99f4132 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Improve dump-nodes-tree commandChristian Kandeler2017-10-054-23/+15
| | | | | | | | | | | | | | | | | | | | | | | | - Remove redundant output also for rule nodes (rather than just for artifacts). - Strip down the list of supported options. Some of the ones we listed there made no sense for this command. - Fix help output and CLI documentation. Change-Id: If13667d48e12de99df3bb19a4f82f97aa9256d02 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Improve status commandChristian Kandeler2017-10-054-18/+7
| | | | | | | | | | | | | | | | | | | | - Indent also the untracked and missing file lists. - Remove pointless options. - Fix help output and CLI documentation. Change-Id: Iba23ad7fc3366cfac02b255b17cca9127556b9bb Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Doc: Describe porting qmake projects to QbsLeena Miettinen2017-10-052-5/+517
| | | | | | | | | | | | Task-number: QBS-407 Change-Id: Ia2f59288e2f9aca0d9fed800ee52c4082cf18d07 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Use range-based for loop in SVConverter::handle(JSSourceValue*)Joerg Bornemann2017-10-051-9/+7
| | | | | | | | | | | | | | | | ...and remove a superfluous indirection to clean up the code a bit. Change-Id: Ibb600f129c324519ce7f9513e7e6551b7a4288d4 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Use std::vector as container for JSSourceValue::AlternativeJoerg Bornemann2017-10-054-8/+11
| | | | | | | | | | | | | | | | QList is an inept container for a class as big as Alternative. This also removes the need for qAsConst in several places. Change-Id: I742c3f9af607eeb7825f8e4eab2e3d040723e543 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Fix shell commandChristian Kandeler2017-10-056-36/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | - Use the build environment rather than the system environment (that's the whole point of the command). - Remove the need for a specific product. - Use a more sensible prompt. - Strip down the list of supported options. - Fix typo in comment. Change-Id: I8e4040d44ab6a95e60a7265e05d5b66fb3dfa878 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Fix help output for qbs-setup-androidChristian Kandeler2017-10-051-6/+4
| | | | | | | | | | | | | | | | | | We forgot to update the help text when we got dropped the "one profile per architecture" approach. Change-Id: I81d7634e6228e4058d97031fc5bdf2a997f35429 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Remove --jobs from the list of options for the resolve commandChristian Kandeler2017-10-052-2/+1
| | | | | | | | | | | | | | | | | | This command does not spawn concurrent jobs. Change-Id: I4bc605b31ff94e463f1c65d98379843b50c36ec4 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Remove unused JSSourceValue::setAlternativesJoerg Bornemann2017-10-051-1/+0
| | | | | | | | | | | | Change-Id: Ia91cf8b93f6d1bcb3d526d13c4e48e2662205232 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Add support for running iOS and tvOS apps on the simulatorJake Petroules2017-10-041-21/+54
| | | | | | | | | | Change-Id: I85e726b6c6508138ec6eb7547307514d9754c960 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Add support for running Android apps on devicesJake Petroules2017-10-044-4/+77
| | | | | | | | | | Change-Id: I1a3a4afb9742f1c89e6396430d178277ea41c451 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Install debug symbols of Qbs apps, libs, and plugins for debug buildsJake Petroules2017-10-044-4/+16
| | | | | | | | | | | | | | This makes debugging with proper symbolication possible on macOS. Change-Id: Iad28ba3cdc2b33d099e5b80687b17d2335af4e5e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Doc: Describe using Qbs Settings dialog to manage settingsLeena Miettinen2017-10-041-0/+23
| | | | | | | | | | Change-Id: Ib96e452ba459be449fdd30edef002bccf51fab3e Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Doc: Create a CLI referenceLeena Miettinen2017-10-0424-34/+1908
| | | | | | | | | | | | | | | | | | | | | | | | | | Each command is described on a separate page. Option and parameter descriptions are fetched from include files. \group and \ingroup commands are used to create a table that shows the CLI commands and short descriptions (from \brief commands). Task-number: QBS-947 Change-Id: I956c0e029f87e98162e03206a79baef604f1d55e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Android: match default NDK behaviorJake Petroules2017-10-042-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unified Headers were introduced in r14 but only became default in r15. So enable them by default if the NDK version is >= r15. Users can manually set the property to use them with NDK r14. Only unified headers are supported in NDK r16+ as the legacy headers are removed. In NDK r16, the default ABI is armv7a and armv5te is deprecated and no longer builds by default. We can't actually check the NDK version in the qbs module due to limitations in Qbs, so we'll just use armv7a as the global default as it has been available and been a suitable default for a long time now. In NDK r17, the default STL will be libc++. Set Android.ndk.appStl to libc++_shared by default in r17 and above. Change-Id: If0a5a60af3ceb483d0614f88dca63c7d66d52b52 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Make the Android autotest more robustJoerg Bornemann2017-10-041-13/+107
| | | | | | | | | | | | | | | | Do not use magic numbers. Compare file lists. Change-Id: Icb1e3b511ef43332335808ab53d94e12e116f647 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | ModuleLoader: Fix false positive in property declaration checkerChristian Kandeler2017-10-047-5/+62
| | | | | | | | | | | | | | | | Assigning module properties in a Group in an Export item erroneously caused an error. Change-Id: Idfbb4986196ad6b1c29d772c919afc9e3ab7b45b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | ModuleLoader: Fix check for Probe.configureChristian Kandeler2017-10-043-1/+11
| | | | | | | | | | | | | | | | | | Item::setupForBuiltinType() always creates a Value object, so the check for Probe.configure never triggered. Change-Id: I2be1b10c2fa29ceb36edddc22585dede9b626ea5 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Log debug messages for failures in non-required modulesChristian Kandeler2017-10-041-0/+3
| | | | | | | | | | | | | | | | | | Such failures might be expected and thus cannot be warnings, but they should get logged. Change-Id: I8ac63f1034b2dcc3e0a23e5d0da648e640f4ab21 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Fix missing error location in case of syntax errors in scriptsChristian Kandeler2017-10-045-2/+22
| | | | | | | | | | | | | | | | | | | | | | We used a backtrace whenever one was available, but if it contains no error location, it actually decreases the usefulness of the error message. In such cases, ignore it and use the fallback error location instead. Change-Id: I7da6a7cf2ddce17f6c1da82fbc4a08148b26e2b4 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge 1.9 into masterChristian Kandeler2017-10-027-2/+47
|\| | | | | | | Change-Id: Ib391e8d1fc1b14849fe6b962d2e4b466dc46aa79
| * Lower the default response file threshold a bit on Windowsv1.9.1Christian Kandeler2017-09-292-1/+11
| | | | | | | | | | | | | | | | | | It has been observed that values somewhat below 32000 can cause issues as well, so use a "safety offset". Task-number: QBS-1201 Change-Id: Ic82a4b4a9d770d8d92b955d1e70194de5baeae1b Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * Fix default value of qbs.buildVariantsChristian Kandeler2017-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | It should be derived from qbs.buildVariant, not from qbs.defaultBuildVariant. Otherwise, overriding qbs.buildVariant from the command line will have no effect on Darwin platforms, where we always multiplex by qbs.buildVariants. Task-number: QBS-1202 Change-Id: I36655d03a1c0e8b01d7a853111d390685ef64a45 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Add undocumented Utilities methods to get the Qbs QML type infoJake Petroules2017-09-273-0/+30
| | | | | | | | | | | | | | This will be used in a subsequent change. Change-Id: I7381d1906aecf08473e30ae06cec9a888bbeaf65 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * GCC: Add support for the AVR architectureChristian Kandeler2017-09-271-0/+5
| | | | | | | | | | | | | | Task-number: QBS-1203 Change-Id: Ide4121f007caf5c7c2ae47bbfd76d66079624081 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
* | Make sure Q_DECLARE_METATYPE is present when using itJake Petroules2017-09-271-1/+1
| | | | | | | | | | | | | | | | This fixes a potential build error in a standard C++ only file. Change-Id: I47abdb7ad0ba2abbd096962d994ad0d590b68bba Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Remove the need for calling Process.close()Joerg Bornemann2017-09-271-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | Remove the need for explicitly calling Process.close() by making sure we automatically close and destroy the object when we finish evaluating a chunk of JavaScript. [ChangeLog] Process objects are automatically closed after the current script execution is finished. Change-Id: I997b989c50d08e2da3141b1c9ae8f999a38c7eb9 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Fix recursion issue when releasing ResourceAcquiringScriptObjectsJoerg Bornemann2017-09-276-26/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling releaseResourcesOfScriptObjects in QScriptEngine::evaluate does not guarantee that the function is called in all circumstances, because evaluate is not virtual. Worse, it might be called at the wrong time by a recursive evaluate. Remove the evaluate overloads, and call releaseResourcesOfScriptObjects manually after the evaluation of - Probe.configure, - Rule.outputArtifacts, - Rule.prepare, - and JavaScriptCommand.sourceCode. Change-Id: Ie4ed0c2d0895a13a8930d7b35c0f22a8d62dc34b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Use Module.priority to choose the right cpp module instanceJoerg Bornemann2017-09-279-3/+11
| | | | | | | | | | | | | | | | | | Replace the negating conditions in our cpp instances with module priorities. This removes the need of knowing about all other more specialized instances in more general instances. Change-Id: I511ba11f2cb69ea1458b786a2db4309de8910ebf Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Refine log messages in ModuleLoader::loadModuleFileJoerg Bornemann2017-09-261-3/+3
| | | | | | | | | | Change-Id: Ie87508e7daed63b7f047ed8e46bfeb920d78ae55 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Merge "Merge remote-tracking branch 'origin/1.9'"Joerg Bornemann2017-09-2615-272/+113
|\ \
| * | Merge remote-tracking branch 'origin/1.9'Joerg Bornemann2017-09-2615-272/+113
| |\| | | | | | | | | | Change-Id: I40c1ea23e7351deac715958783158c089e65a02d
| | * Remove @param comments from languagePropertyName()Joerg Bornemann2017-09-261-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | These comments were outdated, and the remaining function arguments are simple enough. Change-Id: I27ee08a8b528f4ac9480bfdc534d4d315b844e70 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * Remove old precompiled header test dataJoerg Bornemann2017-09-265-191/+0
| | | | | | | | | | | | | | | | | | | | | This was forgotten in commit 0655ccbe. Change-Id: I2319193e4fecb7576d3eb8b2256a9d3708791225 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * Doc: Update the cpp module exampleJoerg Bornemann2017-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Remove the outdated property precompiledHeader from the simplified cpp module. Use includePaths as example instead. Change-Id: Ib51d97a10d4853b09dc475ad1257b7888758c907 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * Set the version number for Qbs applicationsJake Petroules2017-09-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | This influences the version number embedded in platform metadata, such as CFBundleVersion on macOS. QbsLibrary already does this. Change-Id: Ie6a41e5f440ef940be333404183adb280581cd31 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | * Docker image: update to the latest Windows 10 patch releaseJake Petroules2017-09-201-1/+1
| | | | | | | | | | | | | | | Change-Id: I59c4e38be62c41577f2953ac7f3cb3c7f2f1eb08 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | * 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 15:28:49 +0000