aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Make autotests handle profiles with qbs.buildVariant == "release"Christian Kandeler2017-05-162-5/+8
| | | | | Change-Id: Ib8e820b1ef2a59880941baaffb04a94ea1ec31d9 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Doc: Remove profanityJoerg Bornemann2017-05-161-1/+1
| | | | | | Change-Id: I75210b8ab0e5db505aebc5a291ce3b6b1cf75e6d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Make plugin meta data autotest compatible with static Qt buildsChristian Kandeler2017-05-152-6/+32
| | | | | Change-Id: I785c02ceb4a048ca53b29d3883b63402599fdbd9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Qt templates: Do not set cpp.runtimeLibrary in QtModule.qbsChristian Kandeler2017-05-121-3/+0
| | | | | | | This is a scalar value. Setting it once in core.qbs is enough. Change-Id: I5856c447b8c72e2504f4d6e06a9e0199bba66751 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix Android builds with newer SDKsJake Petroules2017-05-101-1/+1
| | | | | | | | | | sdklib.jar was renamed to sdklib-VERSION.jar, and ApkBuilderMain now depends on other JAR files in that directory as well. To simplify, add the entire directory to the classpath, which should be both forwards and backwards compatible. Change-Id: I5ef9ae684dfd57c074a8db4e96d0590a95c7ab94 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Qt modules: Take "static_runtime" config value into accountChristian Kandeler2017-05-102-0/+6
| | | | | | Change-Id: I247c4096912d1eb6ccbdea2df92bb4b294f35fb4 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Track Java manifest files as artifacts in the build graphJake Petroules2017-05-096-19/+60
| | | | | Change-Id: I4e5df616d49b51286a3df83f11807408b59c4fe3 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix Java manifest file parsingJake Petroules2017-05-091-3/+5
| | | | | | | | | | | | | This fixes several issues with the parser: - Empty lines (i.e. the customary trailing newline) would cause the parser to return an empty set of records. - Leading and trailing whitespace was not properly trimmed from each key and value. - An incorrectly formatted manifest file would silently return an empty set of records rather than throwing an exception. Change-Id: Ic3e8007268c3cef66d5472e998ac916cd86b44b3 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix JSSourceValue::clone()Christian Kandeler2017-05-096-0/+56
| | | | | | | | | | | For objects of type JSSourceValue::Alternative, we were mistakenly doing shallow copies, which meant that modules using Properties items could end up sharing the respective values between products, rather than each of them getting their own copy. Task-number: QBS-1121 Change-Id: I7b2b4b776772ac89fe6f08db0dba63b0c277d7ec Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix size_t -> int conversion warning on MSVC (64 bit)Joerg Bornemann2017-05-081-1/+1
| | | | | Change-Id: Ic315f8048cf79598c5dcabf7e5a663e07abcca1f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Try harder to find out the correct location for evaluation errorsChristian Kandeler2017-05-0410-29/+45
| | | | | | Task-number: QBS-946 Change-Id: I2fb5d573f7caf44f96fd4a96fd5069a44cdfb16a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Qt.qml: Link against QML plugins when using a static QtChristian Kandeler2017-04-285-4/+212
| | | | | | Task-number: QBS-1121 Change-Id: Id1da9786d4535a350eed72062848c2745cf8a73b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix commandFile autotest on MacChristian Kandeler2017-04-281-0/+1
| | | | | Change-Id: I44c60b89df55218c0cf15744a9e83e8df653a3ce Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* API: Catch error from ProductInstallerChristian Kandeler2017-04-281-5/+10
| | | | | | | | | ... and emit a warning. This is for the resolve context. On actual installation, a proper error will still be thrown. Task-number: QBS-1122 Change-Id: I7d2e59ebcb18bc49ce0d3cf670fd64d4b5e171fd Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Support command files in cpp.{static,dynamic}LibrariesChristian Kandeler2017-04-2810-3/+50
| | | | | | | We will make use of that in a follow-up patch. Change-Id: I1fb6ca0938bbcc6f53bd0046761023a1b8563949 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Qt support: Scan also cpp files for Q_PLUGIN_METADATAChristian Kandeler2017-04-287-4/+28
| | | | | | | For some reason, that was only done for headers. Change-Id: Ia5d57cb68efdda0e1288fea3bd285e656b24b94b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* libqtprofilesetup: Support default QPA detection also in dev buildsChristian Kandeler2017-04-271-16/+33
| | | | | | | In a developer build, qtgui-config.h is a forwarding header. Change-Id: I7f5747503174eaf04ef96dcd6c6bc70c303b37f7 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix "defined" appearing on RHS of macro definitionChristian Kandeler2017-04-271-3/+9
| | | | | | Change-Id: I2528aa1e2c083cf79ca18d5d06848ec3c7840b25 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* libqtprofilesetup: Add a dedicated template file for Qt.qmlChristian Kandeler2017-04-213-0/+34
| | | | | | | A follow-up patch will add custom content. Change-Id: I0c41d7158a3e1bb24dd31f11be19f9bd9cdc5581 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix "externalLibs" autotest on MacChristian Kandeler2017-04-211-0/+2
| | | | | | Change-Id: Ib8e751bad51614836b5185f30a6147d158a3777f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Add basic documentation for the qnx moduleJake Petroules2017-04-211-0/+93
| | | | | | Change-Id: I94452d0258857c008941bf6efeec5918403b50a1 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* GCC: Do not mess with the list of external librariesChristian Kandeler2017-04-217-8/+81
| | | | | | | | | | | | | | | Consider the following: There are external static libraries libA and libB, with libB having a dependency on libA. Some module pulls in libA, another one pulls in libB and libA. The raw contents of cpp.staticLibraries for the product might end up as ["libA","libB","libA"]. Before this patch, our library collection code "simplified" this list to ["libA","libB"], which leads to a linker error. Since we generally do not know about the dependencies of external libraries, we should not touch these lists. Change-Id: I4a94dfc8505ee9ece2562dc3aa3d66244ec7fdac Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* libqtprofilesetup: Turn "-pthread" into "-lpthread"Christian Kandeler2017-04-201-1/+5
| | | | | | | | | | Otherwise we get errors, because we interpret generic options as linker flags, but -pthread is a driver option. Add a warning for all other "raw" options encountered on the right-hand side of QMAKE_PRL_LIBS, as those are not expected there. Change-Id: If4555caff886c691bddf3ee17bbe7490f9b8fc12 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Detect QNX SDK on Windows in C:\ (one of the default locations)Jake Petroules2017-04-181-1/+2
| | | | | | Change-Id: I78f0619fad050672e296d192f0a3fa2f25dcafd4 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Documentation: Remove duplicated backslash characterChristian Kandeler2017-04-181-1/+1
| | | | | Change-Id: I1baada41c3aaa72f0a042f0d590b925b602ab816 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix autotest for mingwChristian Kandeler2017-04-141-2/+2
| | | | | | | | The linker flag that we chose to test the option escaping mechanism with does not exist in mingw's ld. Change-Id: I3446d1061a07394d0a10ada82ee0840e89b69f3f Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* GCC: remove escaped linker flags compatibility modeChristian Kandeler2017-04-127-17/+51
| | | | | | | | | | | The old warning was incredibly noisy and almost always unnecessary. Users should have had enough time to migrate their projects by now, so specifying pre-escaped linker flags will now properly result in a linker error, but a helpful warning remains by default, which is only emitted if the linker flags look suspicious to begin with. Change-Id: I1ad1e9647fd490619eeb65eeb88f5bbbf58aa18f Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Print output on error in TestApi::rc()Joerg Bornemann2017-04-101-3/+6
| | | | | Change-Id: I687ed4bf045fbf2f38f3da92635475d317de07d8 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix two autotests for mingwChristian Kandeler2017-04-071-3/+4
| | | | | | | We failed to take the file extension into account. Change-Id: Ia5f4eb30bc6989c22068004987e9ccd7e935fd90 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* cpp module: Add toolchain install path to build environmentChristian Kandeler2017-04-061-1/+6
| | | | | | | | ... for mingw. There are DLLs there which are needed by helper tools located in a different path. Change-Id: I20f4937f5e88a75d7261d86885182317965eee91 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* cpp module: Fix artifact inconsistency for mingwChristian Kandeler2017-04-062-12/+13
| | | | | | | | | We declared the existence of the symbols file unconditionally, but did not actually create it in the mingw case, leading to assertions in the executor. Change-Id: Icf135182f79c55fc4f636fd3d7642f08dcfe16d9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix undefined behavior in tst_toolsChristian Kandeler2017-04-061-6/+0
| | | | | | | | | It is not allowed to compare iterators from different containers, and now that we use std::vector rather than QVector to back the Set class, this actually hits us with MSVC. Change-Id: I6b63d5ac341cb68efb87ee2a2f61f11974e621d5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* macOS: Use clock_gettime() only if it's supportedChristian Kandeler2017-04-051-1/+2
| | | | | | | | ... on the minimum deployment target. Change-Id: I19ea185bb1db7c6570d52689ecda5b9a95f02a95 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix doc_targets.priJoerg Bornemann2017-04-041-24/+29
| | | | | | | | The actual target names must be different from the standard one if this work of art is included in other projects. Change-Id: Icceb913a361f1eebbfe955b860f0c9ddc84e3c54 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Launcher socket: Replace an assertion with a proper checkChristian Kandeler2017-04-041-1/+2
| | | | | | | | Calls to sendData() can legitimately come in even after the socket has failed, because the potential callers live in a different thread. Change-Id: I6bfdf20e723ebe089bb9e49d294ae434eefeabbc Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Improve the error message for a crashed process launcherChristian Kandeler2017-04-041-4/+2
| | | | | | | | | | It used to just say "Process crashed" with no context. Also get rid of an unneeded check when emitting the associated error signal. Change-Id: I483342e4f97fadca7105099adb1f163dfbbfc5be Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Merge 1.7 into 1.8Christian Kandeler2017-04-041-3/+3
|\ | | | | | | Change-Id: I98b4595eba11bf78d047a61a4830e83116b61d44
| * 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>
* | Fix build of processlauncher with older Windows SDKsJoerg Bornemann2017-04-041-1/+1
| | | | | | | | | | Change-Id: I6f59c16c5a26ab700496b81c5c9784f679d2db5c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Process launcher: Work around platform-specific QLocalSocket behaviorChristian Kandeler2017-04-042-1/+10
| | | | | | | | | | | | | | | | | | When the peer disconnects, we get QLocalSocket::PeerClosedError on Unix, but not on Windows. So also connect to the disconnected() signal. Change-Id: I42b9fdf0f720c32c96fc70dd29b651c547f2ead0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Fix hang after Ctrl-C on WindowsJoerg Bornemann2017-04-041-0/+14
| | | | | | | | | | | | | | | | | | The processlauncher must ignore Ctrl-C/Ctrl-Break on Windows. It will be shut down by its parent process, which is not prepared for the launcher to suddenly disappear. Change-Id: I63a9bcf84bafcb874e0165edf5d127d66784f071 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | cpp module: Fix mingw supportChristian Kandeler2017-04-032-6/+6
| | | | | | | | | | | | | | | | The output format is not ELF for Windows targets. Change-Id: I04d98379763924229393d82da4057dbe0e99beb5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Handle digits in merged short options as option parameterJoerg Bornemann2017-04-032-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | The argument list ["-a123b987"] becomes ["-a", "123", "-b", "987"]. Merged short options cannot be digits, e.g. ["-7j1"] is an error. This way we can support the "-j8" option that everybody knows and loves from make and other make'ish tools. Task-number: QBS-196 Change-Id: I574d77e8f85a708708ebed43668bb3c6ca916233 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Fix size_t -> int conversion warnings on MSVC (64bit)Orgad Shaneh2017-04-033-3/+3
| | | | | | | | | | Change-Id: I410e531fa3cebffb282350904a4caa3e5002fce2 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>
* | Cumulate delayed product errorsJoerg Bornemann2017-04-034-5/+45
| | | | | | | | | | | | | | | | | | | | | | If a delayed error leads to other errors later on, we would output the later errors without showing the original - more important - delayed errors. Cumulate delayed product errors and pass them up the stack. Change-Id: Ibdfc6d3e301a80ef265792907b3e4a150a22ef8b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Make cpp.internalVersion writableJoerg Bornemann2017-03-311-1/+1
| | | | | | | | | | | | | | | | People are settings this property to prevent producing libraries with version numbers in their name while still setting product.version. Change-Id: I0a0e9643a0177541dc4492a9034421d2e6b8174c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Allow running qbs without a profileChristian Kandeler2017-03-319-25/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | When no profile is given and no default one exists, simply use the modules' default values. The most relevant effect of this is that users can now build for the host platform by simply typing "qbs" without having done any manual setup, if there is a compiler in the PATH. [ChangeLog] It is no longer strictly required to provide a profile. Change-Id: Ifee09d2653dfbd4ea06c59248d78e376da2f217b Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Make some adjustments necessary for QNX < 7 supportJake Petroules2017-03-292-3/+5
| | | | | | | | | | Change-Id: I978772eff14a1120921b34b861ff853e8d50c971 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Specify target linker flags for GNU ldJake Petroules2017-03-291-0/+4
| | | | | | | | | | | | | | | | Facilitates cross compiling between x86 and x86_64 on non-Darwin Unix when using the system linker. Change-Id: I4cb8fc7f7eb4ee13527fabcf91e8cf1d0fe1fcef Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 06:00:50 +0000