aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix ScriptEngine::PropertyCacheKey1.7Christian Kandeler2017-04-041-3/+3
| | | | | | | | The members of this class must not be references, as its objects are not temporary. Change-Id: I9bd4263079a365f5ffda606d8c8db27b370a1a24 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* ModuleLoader: Fix access to temporary objectChristian Kandeler2017-03-201-1/+1
| | | | | | Change-Id: I91a902a438a7fd014f518c351b19d617af1f4707 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix setup-toolchains for Visual C++ Build ToolsJoerg Bornemann2017-03-161-9/+57
| | | | | | | | | | The VC Build Tools can be found in a slightly different location than the Visual Studio registry entries. Task-number: QBS-1114 Change-Id: Ib7dea5e5883271f55371383996e0641e270f3585 Reviewed-by: Yuchen Deng <loaden@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix App Extension builds on older versions of Xcode/macOSv1.7.2Jake Petroules2017-02-171-4/+6
| | | | | Change-Id: Ib25d942da9ba019ceb5b7a64e1fd703d6f4b9baa Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Set product run environment in generated Visual Studio projectsJake Petroules2017-02-081-0/+53
| | | | | | | Task-number: QBS-1100 Change-Id: Ic2edf882dacd17e4833074e52715dc42bb74cdac Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Replicate '--settings-dir' option to Visual Studio generatorDenis Shienkov2017-02-088-17/+52
| | | | | | | Task-number: QBS-1077 Change-Id: Ib20d8d8242f8b51ba353968e39cedb8945a86331 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Generators: pass down full InstallOptions instead of just install rootJake Petroules2017-02-073-5/+7
| | | | | | | This is needed for a followup patch to add environment handling. Change-Id: Id492226c4b51646a97f7c2de1bb7e91dab512d32 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Doc: Update copyright year in online doc template to 2017Leena Miettinen2017-01-251-1/+1
| | | | | Change-Id: I7c5e142ebe60f5d6e816d4e04bc934b8cfe38a06 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Version bumpChristian Kandeler2017-01-232-2/+2
| | | | | Change-Id: I59fe6d6a5464a1ebaf451da52e95772db02800c1 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix handling of files on network shares on WindowsChristian Kandeler2017-01-171-3/+10
| | | | | | | | These need a different "long path prefix". Task-number: QBS-1096 Change-Id: I91baf4ccf1155c7de3f76ca9d842a910fd501397 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix outdated code construct in QtPlugin.qbsChristian Kandeler2017-01-164-1/+26
| | | | | | | | Artifact.filePath is evaluated at build time these days. Task-number: QBS-1094 Change-Id: If0e4358973d56e58c99e6765f6a9e124e48d07f6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix some iterator type mismatchesChristian Kandeler2017-01-062-3/+2
| | | | | Change-Id: I00c4d0ffb25211eeec9533606f8f9762626d0e56 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Do not leak the build graph locker if project resolving is cancelledv1.7.1Christian Kandeler2017-01-052-3/+18
| | | | | | Task-number: QTCREATORBUG-17543 Change-Id: Ie32f5e9729dc98705b0d0d27839d9544ffd29a43 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Clean up the documentation for the Scanner itemChristian Kandeler2017-01-051-6/+5
| | | | | Change-Id: Ie80e267263a59458862cfcfb54394b702e201d28 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Check the type of the top-level itemChristian Kandeler2017-01-054-3/+21
| | | | | | | | We neglected to do that so far. If a project's top-level item was not Project or Product, an internal error would be thrown. Change-Id: I7f4ca74107a6bcc990d21f998ae6c5b9732bfb28 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* cpp module: fixed output path for pch_copy file in JavaScriptCommandSergey Petrov2017-01-051-1/+1
| | | | | Change-Id: Icec903bef4cfccf3a1d1075b46bda57e1cfa5fad Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix race condition in qmake buildChristian Kandeler2017-01-053-0/+3
| | | | | | | | Task-number: QBS-1091 Change-Id: I5cead5f3cd111ea66bec31a178f69c992a4024a1 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Use different tags for debug info created by different rulesChristian Kandeler2017-01-025-23/+28
| | | | | | | | | Otherwise, rule conflicts occur when users try to process the "debuginfo" artifacts further. Task-number: QBS-1089 Change-Id: I70141cfbf2a966ab0414cbabab5e4785fd4a96c6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Do not create bundle-related artifacts for non-Darwin targetsChristian Kandeler2017-01-021-1/+3
| | | | | | | | This is erroneously done at the moment when separate debug information is enabled. Change-Id: I97474d8d08e31de9db20f738f21e0c753d929c4d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Prevent undefined values from getting into listsJake Petroules2016-12-232-3/+3
| | | | | Change-Id: I8979a11ce27ffb363fa6bd696b132a9710300fa5 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Remove unused functionJake Petroules2016-12-221-14/+0
| | | | | | | | This amends 532e8ea991cf0dede72d3f357619f49f4b36187b, which removed the restriction that two build configurations must use different profiles. Change-Id: Ie9536c33baa621180e398937b24132da3758e85b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix qbs-setup-toolchains with concretely specified MSVCJoerg Bornemann2016-12-212-1/+2
| | | | | | | | | | We must call init() on every MSVC object. Also, MSVC::clPath must point to the directory where cl is. This amends commit fb2cf69d. Task-number: QBS-1084 Change-Id: Iaa8b3f6a5a0b88b998c2da31d9056f22a511d05d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ModuleLoader: Do not cache Probes that throw errorsChristian Kandeler2016-12-201-6/+6
| | | | | | | | | Doing so can hide errors, for instance when such a Probe is first run by a non-required module instance. Task-number: QBS-1074 Change-Id: Ibfbba029761b7d09d0a02eeaf5aa01f76c701574 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix javaDependencyTracking autotest with Java 6 on Windows and LinuxJake Petroules2016-12-193-16/+28
| | | | | | | | Both rt.jar *and* tools.jar are part of classes.jar in Apple Java 6, not only the former. tools.jar is present in all other versions of the JDK. Change-Id: Ia045d17c768963fd454f0ed81d95940c4a33d2b7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix clangdb autotests with MSVC and MinGWJake Petroules2016-12-193-15/+35
| | | | | | Change-Id: I6db4e074fb7aa4956ccaca7e57d4b674bc2d0c9a Reviewed-by: Christian Gagneraud <chgans@gna.org> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Do the buildgraph sanity checks only on demandChristian Kandeler2016-12-191-10/+1
| | | | | | | This procedure is too slow to enable by default even in debug builds. Change-Id: Ib77bba191841d3d50fbf5be482021b71dfa19e08 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* VS generator: Don't prepend $(ProjectDir) to absolute pathsThomas Epting2016-12-181-2/+6
| | | | | | Task-number: QBS-1081 Change-Id: I62f2016f87d0186eea6f8c7e3e784ab28f72f981 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* VS generator: Add missing trailing backslash to OutDir variableThomas Epting2016-12-181-1/+3
| | | | | | Task-number: QBS-1080 Change-Id: I1b390dd31d10675f0e1f4fe3abdee2980909724d Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* EvaluatorScriptClass: Catch exceptions from script importing codeChristian Kandeler2016-12-161-4/+26
| | | | | Change-Id: I435a3610f0b5eed9eabb012592ef13f36f8c68cc Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Bump versionChristian Kandeler2016-12-142-2/+2
| | | | | Change-Id: I8e14795decf3b29290a258f0c1fa03d41fc07c5b Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix deploymentTarget autotest with older versions of XcodeJake Petroules2016-12-143-18/+40
| | | | | | | | As a consequence, Xcode SDKs which Qbs recognizes but which do not exist on disk will now produce a much more readable error message. Change-Id: Ib847fca85ed02cadb33d3a3e944b41fa52a1c6f0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* MSVC: Add "WIN32" to the list of platform definesChristian Kandeler2016-12-141-0/+1
| | | | | | | | | This macro is set when building with Visual Studio and is often used interchangeably with the compiler define "_WIN32" by developers when testing for the platform. Change-Id: I4e14ffae162793bd8559796b449e26a3899d8cc8 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Allow passing autotest wrapper arguments to qbs autotestsJake Petroules2016-12-131-0/+2
| | | | | | | | Useful for sending test output to files in continuous integration, for example, where the arguments must vary for each individual test. Change-Id: I7b01e836d07864e41c6ab19810a5fcadfe840e44 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix clangdb autotest on WindowsChristian Kandeler2016-12-131-0/+12
| | | | | | | clang-check.exe does not understand MSVC-style command-line arguments. Change-Id: If273d0a1f2a04918fccb2af06fddbdb3a6568cf1 Reviewed-by: Jake Petroules <jake.petroules@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>
* Allow passing autotest arguments to qbs autotestsJake Petroules2016-12-121-0/+2
| | | | | | | | Useful for sending test output to files in continuous integration, for example. Change-Id: Ib9437f53347bae6e6db42cede18184151f8947d4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix erroneousFiles test on Windows when ls.exe is in the PATHJake Petroules2016-12-121-1/+1
| | | | | Change-Id: Iaaf229fe1794c70564bf7d898b49c37835da22db Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Split up javaDependencyTracking testJake Petroules2016-12-122-15/+31
| | | | | | | | | This now runs as a series of individual tests that take approximately 10 seconds each rather than one giant monolithic test that takes several minutes without any progress indication whatsoever. Change-Id: I02432818bb1fc45677926cf42d7815ebd1b8dec1 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix unnecessary output noise and absolute path assertions in testsJake Petroules2016-12-123-1/+5
| | | | | Change-Id: I59e7efa8d91ade54582cfffb39226724e22a4f69 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Include information on cost of storing the build graph when profilingChristian Kandeler2016-12-091-0/+1
| | | | | Change-Id: I445c0202178906dc6f8b04ff6f8e94f31fc705c4 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Turn process execution errors in GccProbe into fatal errorsJake Petroules2016-12-091-2/+2
| | | | | | | | | | | | | There is absolutely no point continuining from here, and ignoring errors from executing the compiler will simply result in a more cryptic error message for the user. For example, the bug fixed by the previous patch set resulting in an "unknown arch armv7" error message from Clang was actually displayed as missing compiler version properties, seemingly unrelated. Change-Id: I7ddf4a8f7b82a71355065074aae5401e7292bae1 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix passing -arch x86_64h or -arch armv7 to Clang for Apple targetsJake Petroules2016-12-099-13/+116
| | | | | | | | | | This fixes a regression `clang: error: invalid arch name '-arch armv7a'` when building for iOS armv7, which affects Qt Creator in particular. Expand the scope of the deploymentTarget autotest to verify it does not happen again. Change-Id: Ic2689ec4474f74642d3de641b57a52854d2a8bdc Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix some issues in the WiX module causing the autotest to failJake Petroules2016-12-093-19/+33
| | | | | | | | | | | | | | | | This allows qbs.architecture to be undefined for WiX, in which case the WiX default architecture of x86 will be used. The autotest would fail if there was no architecture set in the profile (which is allowed). This also corrects the registry key name for finding WiX, leading to incorrect autotest failures if WiX tools were in not in the PATH or WiX properties were not set in a profile. Lastly, this fixes a wrong concatenation of product.buildDirectory and improves the output and error reporting for the autotest. Change-Id: I227924b681131c13fcb09d2d5010b372ff44b241 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix javaDependencyTrackingInnerClass test when Java is not installedv1.7.0Jake Petroules2016-12-091-1/+9
| | | | | Change-Id: Ie700233a6b65eb094291e81b274de539e8c2fb51 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Downgrade error message from JavaCompilerScanner to a warningJake Petroules2016-12-076-4/+35
| | | | | | | | | | | | | This is not actually fatal, as Qbs collects dependency information both from the TreePathScanner API *and* the output files the compilation process writes to. Instead, downgrade it to a warning and also point users to the bug report. This fixes a regression from 1.5.x. Adds an XFAIL'ing autotest. Task-number: QBS-1069 Change-Id: I30e5f5d0d1554bf5078509768fdad12f20922319 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix propagation of defines to dependencies from QbsLibraryJake Petroules2016-12-071-2/+3
| | | | | | | | | | | | | | | The Export of cpp.defines could not possibly have ever worked as triple equals comparison of a string and array will always be false. Fix that, and then fix the resultant build errors by avoiding the addition of the QBS_STATIC_LIB define to an importing dynamic library, and warning in the case where the same translation unit will be seen with different visibility settings in different contexts. This also fixes warnings in generator plugins due to the different visibility. Change-Id: Icf91bfd5644c436ddea819cce61b7a4b654c0db4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Documentation: split list of items into language and convenience itemsJake Petroules2016-12-0731-57/+109
| | | | | Change-Id: Ia2f48518a4a78070a05a494c46debc8903308fa2 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix unused variable warningJake Petroules2016-12-071-0/+1
| | | | | Change-Id: I033c2e4b68dc29d06dec88d640c2bfc530627a03 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix language tests on WindowsChristian Kandeler2016-12-071-1/+1
| | | | | | | FileInfo::exists() requires clean paths now. Change-Id: I40eb3273bd0a67174cc7e91c544e5e6cfb954890 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix usage of restored ProbesChristian Kandeler2016-12-072-2/+4
| | | | | | | | We have to set these up per actual product, not per product name. The latter is not taking profile multiplexing into account. Change-Id: I359c7316f106b756aaee74a5f4b7050fbc4e2bf3 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-11 13:42:02 +0000