aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* 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>
* 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>
* Add a PropertyListVariableExpander classJake Petroules2017-09-202-73/+105
| | | | | | | | | | | | This allows us to control exactly what warning message is displayed when the expandPlistEnvironmentVariables function encounters an unknown variable replacement, as opposed to whether or not a hardcoded message is shown. We use this new functionality in the Info.plist processor in order to give a much clearer message what went wrong and where the user might look to correct it. Change-Id: I967ea87c837f9aa2b67bad292e392b356fee8bed Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Add --limitoutput option when building Chocolatey packageJake Petroules2017-09-181-0/+1
| | | | | | | This suppresses advertising messages from showing up in the build log. Change-Id: I5aa34b061d04d314b0ac6b83fb9c569dafca462d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix prefix of generated source archivesJake Petroules2017-09-161-3/+3
| | | | | | | | | | This removes an erroneously added top-level "dist" directory within the generated archives. Amends c9f8116 Change-Id: I2446b8a769dc927ae571889f2646f1f75c06770d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add missing documentation for cpp.endianness propertyJake Petroules2017-09-161-0/+8
| | | | | | | Amends 38bb125aae Change-Id: Ie9dec55245554e3c6639b66c7814e904c48b24b1 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix OTHER_FILES for the item reference documentationJoerg Bornemann2017-09-111-1/+2
| | | | | | | This amends a8df8bc96. Change-Id: I503799daa0120c2423cb20867c70b5e4b0810374 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix deployment of dmgbuildJake Petroules2017-09-073-5/+5
| | | | | | | | | Specifically, this fixes use of the module within Qt Creator. It happened to go unnoticed with the command line version of Qbs. Task-number: QBS-1182 Change-Id: I449099c1063595612dac621c735050c46ff866e5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Docker/Windows: use a simpler workaround for UNC paths in release scriptJake Petroules2017-09-072-3/+3
| | | | | | | | | | This should make release builds faster since all of the source files don't need to be copied to a temporary directory. Qbs is also updated to 1.9 since another bug was fixed in that version which prevented from building when the Qbs sources were located in the root of a drive. Change-Id: I9d333dd0e0bf1fafc72cff093c90f8d0111162b3 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix typo in operator< for ProductDataJoerg Bornemann2017-09-071-1/+1
| | | | | | Task-number: QBS-1185 Change-Id: Ia44c4a87d860a40e93b2efd4a3f67d995f66522d Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Version bumpJoerg Bornemann2017-09-051-1/+1
| | | | | Change-Id: Icc07c68b5e88145906ac99006bf83cab4b93e31a Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* TextFile: Always destroy QTextStream before QFileJoerg Bornemann2017-09-011-2/+2
| | | | | | | | QTextStream's destructor tries to write unwritten data to its QIODevice. Make sure that we destroy QFile after QTextStream to avoid crashes. Change-Id: I0cf7a0d642b27ba611d431ed036a43a2988b9d2f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ModuleLoader: Fix adjustment for multiplexed dependenciesv1.9.0Christian Kandeler2017-09-014-147/+169
| | | | | | | | | We erroneously gave the responsible function only a local project view instead of the global one, meaning dependencies could fail across subprojects. Change-Id: I18155df39cb981aed36e204ea2a85ed26a7eb6c7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Document the relevant file tags of the ib moduleJake Petroules2017-08-302-0/+54
| | | | | | Task-number: QBS-934 Change-Id: Iab702d0f450bf4335030f5f927cbf4b92cc61652 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Document the relevant file tags of the wix moduleJake Petroules2017-08-291-0/+43
| | | | | | | Task-number: QBS-934 Change-Id: I351fcaead747bc7fab4eee11d53998c8c77d2150 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Document the relevant file tags of the nsis moduleJake Petroules2017-08-291-0/+26
| | | | | | | Task-number: QBS-934 Change-Id: I7e68da609dbf57f7d280335511d9b3a9fe6e9083 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Document the relevant file tags of the bundle moduleJake Petroules2017-08-291-0/+6
| | | | | | | Task-number: QBS-934 Change-Id: I1abd73c9ff41ddc1b65a7b50cbd383c06cd6a005 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* cpp module: fix detection of ARMv8 (32-bit) architectureJake Petroules2017-08-291-1/+1
| | | | | | | | qbs.architecture is now set to "armv8" instead of "arm" for this architecture. Change-Id: I6d33e9c34ae8e617d6d194981f6051b3a09f643a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* resolveSymlinks: Fix relative symbolic links on WindowsOrgad Shaneh2017-08-281-1/+1
| | | | | | | | | | | | | Works around QTBUG-62802. When a (real, not lnk) symbolic link on Windows references a relative path, the absolute path is not resolved. Using a QFileInfo with this relative path will reference the path relative to the PWD instead of relative to the link. Change-Id: I2edacb6d368e28fa240e7a866692391cf67f0ca2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Chocolatey package: update owners list; qbs now has its own accountJake Petroules2017-08-281-1/+1
| | | | | | Change-Id: I0128f3dc7869efb5db2ac3dbb5a5aa140e5e8b98 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* mingw: Fix manifest ruleChristian Kandeler2017-08-281-2/+4
| | | | | | | | The "inputs" parameter is not an array. Change-Id: I30355eb5e6fad7749a28d15453196f05add8dd17 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix dependency tracking when using --check-timestampsChristian Kandeler2017-08-287-1/+39
| | | | | | | | | | | The --check-timestamps option is meant to be used to reconstruct a build after accidentally removing the build graph file. This means we must re- scan sources even though they appear up to date, in order to reconstruct e.g. dependencies between C++ sources and headers. Task-number: QBS-1178 Change-Id: I19ac385e57ceb7fcbba2df1ef24497935c067512 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Add code attribution documentationKai Koehne2017-08-242-0/+214
| | | | | | | | | | Manually add the documentation generated by qtattributionsscanner out of the qt_attribution.json files. We can generate these on the fly once we can depend on Qt 5.8. Change-Id: Ia898044e854d473ae93ba07a9ff21e043ba29a29 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Fix problems with drive root paths on WindowsJake Petroules2017-08-234-12/+36
| | | | | | | | | | | | | | | This patch ensures that paths are correctly resolved against drive roots on Windows, for example, resolvePath("C:\\foo", "..") now results in "C:\\" rather than "C:" which is actually a relative path. It also fixes a related issue in the product installer where one character may have been truncated from the middle of a path since the (absolute) prefix was always assumed to NOT end with a slash, which is always canonical on Unix but not necessarily on Windows in the case of drive roots where a trailing slash is necessary to differentiate from relative path of the current drive. Change-Id: I6c5ab1de517bb6933c3b4aebdd22236bb71c1d37 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Support MSVC's /std optionChristian Kandeler2017-08-236-2/+135
| | | | | | | | | | We failed to notice that it was introduced with update 3 of VS 2013. [ChangeLog] The cpp.cxxLanguageVersion property now gets mapped to MSVC's /std option, if applicable. Change-Id: I00d45aecefb2ad27f2b5891d62d591179f2dbeec Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Revert "Generate code attribution documentation"Christian Kandeler2017-08-236-57/+3
| | | | | | | | | This reverts commit c75285b0b6c2d10a08acdc78c0554831c42c52c6. The qtattributionscanner was introduced in Qt 5.8, while our minimum Qt version is 5.6. Change-Id: I444058236e946584fc133a9a7ee93fa1a9969b94 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Generate code attribution documentationKai Koehne2017-08-236-3/+57
| | | | | Change-Id: I692efc667d5e9713afee0cd2ee155ac24ed3de56 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Simplify export macro definition of the QML parserJoerg Bornemann2017-08-223-2/+9
| | | | | | | | | | | We always want QML_PARSER_EXPORT to be empty. Enforce this by adding the necessary preprocessor macros directly in qmljsglobal_p.h. This removes the need to define QT_CREATOR and QML_BUILD_STATIC_LIB=1 in our project files. Also, we failed to do it correctly and always dllimported the QML parser's symbols. Change-Id: Ibecb2582546385c2067bd01edaba8694aa057e51 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Android: Do not modify libraries in the NDKChristian Kandeler2017-08-221-8/+26
| | | | | | | | | They don't belong to us, and they may not even be writable. Instead, make the strip command create a new file. Task-number: QBS-1176 Change-Id: Ifd387d3fbcf475e662344ceefa6d289b45c4ae16 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix MSVC linker warningJoerg Bornemann2017-08-224-4/+4
| | | | | | | | Ensure that export macros appear only once per declaration. This fixes the warning "C4141: 'dllimport': used more than once". Change-Id: I65bdbb8db574e49ad9fddfa5d2071f4715ed1265 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Docker: check that the installation of Chocolatey packages succeedsJake Petroules2017-08-221-4/+4
| | | | | | | | | | | | In some versions of Windows with a certain set of patches installed, the Visual C++ Build Tools installer has been observed to fail during initialization but still exit with zero status causing a silent failure. This patch ensures that it won't be possible to build a Docker image where the build tools didn't actually get installed. Change-Id: Ibc90b476dae901651002a3619f7c1dbec38bc51b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Docker image: update to the latest* Windows 10 patch releaseJake Petroules2017-08-221-1/+1
| | | | | | | | | | | | *We actually only update to 10.0.14393.1480 and not 10.0.14393.1593 because at the time of writing, .1593 causes the installation of Visual C++ Build Tools to silently fail. Safeguards against this failure will be provided in a subsequent patch. Change-Id: I3b643592a5948daafc00f84489e54211679666cc Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add Windows UAC fix to qbs-setup-android and qbs-setup-toolchainsJake Petroules2017-08-214-0/+27
| | | | | | | It was only applied to qbs-setup-qt, but missing from the others. Change-Id: I3f2dd63c717d9117a8699fc76bac93e573cad60c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix edge case in change trackingChristian Kandeler2017-08-218-0/+60
| | | | | | | | | Under certain circumstances, transformers could lose the information about properties requested by their commands. Make sure this doesn't happen anymore. Change-Id: Ib224cd8425760543ae805875024e7886f67825fe Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Qt, iOS: add platform plugin linker flags only to the platform pluginJake Petroules2017-08-161-4/+6
| | | | | | | | The platform plugin should not be a dependency of every module. Change-Id: Icf4cad08c145349fe82495b5da15029576634d9f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix iOS linked libraries for Qt 5.8+Jake Petroules2017-08-162-5/+7
| | | | | | Task-number: QBS-1155 Change-Id: Ifba12c84d8d803706ac27406bec8f9696ccb9c64 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Don't set the *_DEPLOYMENT_TARGET environment variables to empty stringJake Petroules2017-08-141-8/+8
| | | | | | | | | | | | | | | | | | | | This is a partial revert of a7247ff1cde96864243eba3bf5d36d6b5bded2d6, which caused Qbs to set the *_DEPLOYMENT_TARGET environment variables to the empty string if no value was provided for the deployment target. The empty string causes problems for some tools like `strip`, which passes the empty string verbatim to the -*_version_min flag of an internal invocation of `ld`, which is not allowed. Presumably the original intent was to influence the target platform that the compiler would use, but this does not work (at least with current toolchains) if the value is the empty string. It also shouldn't matter since we use -target now, which explicitly states the platform. In that case, the compiler will choose a minimum version internally if one is not explicitly given. Change-Id: I7d9f12bb52bf3289c0c5e3353a928c8cb0be9531 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ModuleLoader: Remove invalid assertionChristian Kandeler2017-08-143-4/+35
| | | | | | | | The assumption that all list properties must have acquired a defining item at some point is simply wrong. Change-Id: I34d035e50b5d5cd8c62f1baba899326b92ade8d1 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 20:53:49 +0000