aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Documentation: Fix file tag in QML how-toChristian Kandeler2018-10-251-1/+1
| | | | | | | | | | Change-Id: Ib9c62947e79b2e828587e5b7c75a0585caba1273 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix Android autotests without a dedicated profileChristian Kandeler2018-10-232-0/+2
| | | | | | | | | | Change-Id: I95d21a41a7fdf879f45f59648ce1ba693d3a9c40 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Executor: Increment progress bar after a rule's transformers are doneChristian Kandeler2018-10-224-2/+30
| | | | | | | | | | | | | | | | | | ... rather than after the prepare script has run. This gives a more realistic estimate on average. Fixes: QTCREATORBUG-18523 Change-Id: I61214903936f964e060b92238d5644f0a8414539 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* | Android: Convert to new-style property access syntaxChristian Kandeler2018-10-191-6/+4
| | | | | | | | | | Change-Id: Ie8a6972b5daf5cd1ef98bde65ed4db856ad4a735 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Android: Enable building apps with native code and no multiplexingChristian Kandeler2018-10-198-17/+91
| | | | | | | | | | | | | | | | | | | | | | Until now, we needed to either put the native part into its own product or use multiplexing with the "APK product" serving as the aggregate. Now it is also possible to use a single product without multiplexing, which is a more natural approach in the case where there is only one architecture. Change-Id: I976168c99f75ad8e4940ac61f957c64ad29f5f5c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge 1.12 into masterChristian Kandeler2018-10-195-13/+29
|\| | | | | | | Change-Id: Id6014173f52d07f1e7c15b19ddf3876bc95708a5
| * qmake build: Opt out of qtquickcompiler functionalityChristian Kandeler2018-10-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qtprofilesetup library contains a resource file with JavaScript sources. Now if "CONFIG += qtquickcompiler" is set globally, as it happens by default in Qt Creator, qmake believes that we want to compile the js files, which leads to disaster. Arguably, Qt should ignore the qtquickcompiler CONFIG value if the product does not pull in QtQml, but until that happens, let's force- disable the qtquickcompiler. Fixes: QTCREATORBUG-21340 Change-Id: If4802277ab66b550b0c88e5678cadf59a32e68d2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * qtprofilesetup: Understand the mkspec prefix "mingw"Christian Kandeler2018-10-184-13/+27
| | | | | | | | | | | | | | E.g. Fedora provides "mingw-w64-g++". Change-Id: Ife197baa8ddd1b364025056b1ec7895a0b60d5dc Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Android: Update compiler flagsChristian Kandeler2018-10-151-31/+6
| | | | | | | | | | | | Fixes: QBS-990 Change-Id: I185890808af1839a23c1551fe5554be40822561b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Android: Make sure the manifest file has the right package nameChristian Kandeler2018-10-123-4/+35
| | | | | | | | | | | | | | | | This prevents Android.sdk.packageName to get out of sync with the respective entry in the manifest file. Change-Id: I9cc8af5f74da2515d094b3988104f5037a12574a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge 1.12 into masterChristian Kandeler2018-10-1236-110/+374
|\| | | | | | | Change-Id: I96c735aeda89e02f1fa9107ecfc10ebf4b554dbc
| * libqtprofilesetup: Try to find the library when .prl file is missingChristian Kandeler2018-10-121-10/+27
| | | | | | | | | | | | | | Task-number: QBS-1399 Change-Id: Icf2cf11cf50560cc2229240a592d477a39b69d7a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Exporter.qbs: Prevent passing an empty string to FileInfo.relativePath()Christian Kandeler2018-10-121-1/+1
| | | | | | | | | | | | Change-Id: I55a5daf06dfc89a302914a3e3a0734540e2b401e Reviewed-by: Alexander Jakobi <alex.jakobi@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Fix build with MSVCChristian Kandeler2018-10-111-1/+1
| | | | | | | | | | Change-Id: Iec49ba912161d5411a59440925dfd868a9c794fb Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * Remove bogus assertion from Properties item handlerChristian Kandeler2018-10-117-1/+58
| | | | | | | | | | | | | | | | | | It does not appear to serve a purpose, and it prevented deriving from the Properties item. Change-Id: Icf71e3358299ea7a0f697637967e65dd0fb9b743 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * Android support: Adapt to changes in newer revisionsChristian Kandeler2018-10-119-31/+89
| | | | | | | | | | | | | | | | Revision 17 dropped some architectures, revision 18 removed GCC. We also missed some earlier changes to clang-related paths. Change-Id: Ie2fa1891f7f4de28e18ea6caadce9eac964bb523 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * libqtprofilesetup: Properly handle quoted paths in .pri filesChristian Kandeler2018-10-111-1/+29
| | | | | | | | | | | | | | Fixes: QBS-1399 Change-Id: I52e93a1d80203337c9cedbc09386b0c6c5334f91 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Qt templates: Take sanitizers into accountChristian Kandeler2018-10-091-0/+14
| | | | | | | | | | | | | | | | | | | | If Qt was built with e.g. address sanitizing, then code linking against it should also have it enabled. Otherwise applications will not run out of the box. Change-Id: I25360d72073499a10ba84d84a47e539f39baf318 Fixes: QBS-1387 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Documentation: Mention qmake's OTHER_FILES in the porting guideChristian Kandeler2018-10-091-4/+5
| | | | | | | | | | | | | | Fixes: QBS-1388 Change-Id: I3d4dadcf9e16d839289960252a068e29058255cf Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Persistence: Remove template specialization for time_tChristian Kandeler2018-10-081-14/+0
| | | | | | | | | | | | | | | | | | | | It does not appear to be necessary, and it can conflict with other partial specializations. Change-Id: Ia51d967d8610ac62a9c6ebe28847589c8eb77304 Fixes: QBS-1395 Reviewed-by: Vadim Zhukov <persgray@gmail.com> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * MSVC: Add support for the Visual Studio 2017 Build ToolsChristian Kandeler2018-10-084-12/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This entails: - Auto-detection: The Build Tools no longer have an entry in the registry; use the vswhere tool instead. - Unset the VSINSTALLDIR environment variable before calling the vcvarsall.bat script, as this variable can confuse the msbuild.bat sub- script if it is set. - Look for the base include directory two levels above the directory under which cl.exe is located. Change-Id: Id8f7976e5f41015e59850d3ed68fa81b6ce701a2 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * Fix autotests for Xcode < 10Christian Kandeler2018-10-081-1/+2
| | | | | | | | | | Change-Id: Ia162d7fb17e69e4d0c30678d0e2e3bf31418a711 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * Fix autotests for Xcode 10Christian Kandeler2018-10-0510-31/+40
| | | | | | | | | | Change-Id: I0d218f415eedbfc75c2cf10877646f6831f38f89 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * Fix TestBlackbox::cxxLanguageVersionChristian Kandeler2018-10-041-1/+1
| | | | | | | | | | | | | | One of the if-clauses was missing an else keyword. Change-Id: Ibbc7946adedf82902748521b9c550759a4405d23 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * Version bumpKai Koehne2018-10-021-1/+1
| | | | | | | | | | Change-Id: I91586f7fbab2524f173e470d6846ecac3f5ce030 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | cpp module: Work around distcc quirkChristian Kandeler2018-10-111-0/+20
| | | | | | | | | | | | | | | | | | | | Apparently, the distcc tool requires its argument to be a pure file name rather than a full file path. Task-number: QBS-1336 Change-Id: I6de8ee2f8fa341929a0f1057cbb491a15ec0446b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Android: Allow additional assets and resourcesChristian Kandeler2018-10-111-4/+41
| | | | | | | | | | | | | | | | | | | | | | Until this patch, we were limited to the assets and resources located in Android.skd.assetsDir and Android.sdk.resourcesDir, respectively. Now additional assets and resources, possibly auto-generated, are considered as well. Change-Id: I9577c81ccff94624a70cf706f55ddaa8e0b68992 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | File existence check on Flatpak and OSTreePier Luigi Fiorini2018-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OSTree uses mtime 0 for all checkouts in order to maximize sharing of objects. (i.e. two identical source files with different mtimes should result in the same hardlinked file in the ostree checkout) However Qbs thinks the file doesn't exist with mtime 0 so we need to rely on a different way for OSTree. OSTree nowadays is not only used by Flatpak, but also some Linux distributions like Fedora Silverblue and QtOTA itself. Change-Id: Ia2efc269dc6eb1862b4015bdcce7f9207f3a5efa Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Android: Rewrite the rules gathering binaries for packagingChristian Kandeler2018-10-045-154/+114
| | | | | | | | | | | | | | | | | | | | | | These rules were unnecessarily complicated; in particular, the indirection via a text file for the gdbserver and STL binaries was not needed. This also fixed the gdbserver file name in the package: It has to be libgdbserver.so, rather than just gdbserver as on the host. Change-Id: I2315660983904e8b922164be9054d6bba51f852d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Document how to add QML files to a projectMitch Curtis2018-10-041-0/+24
| | | | | | | | | | | | Task-number: QBS-1390 Change-Id: Id339d9d2041ca035607ee970e421c21f40424987 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Qt templates: Do not add "/Zm200" flag for MSVCChristian Kandeler2018-09-061-1/+0
| | | | | | | | | | | | | | | | | | Qt used to do that at some point, but that was for historical reasons, and is not done (or needed) anymore. Fixes: QBS-1383 Change-Id: Ifb430997acba2ee6dfef3bd185280eb8adb2c526 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Fix potential dereference of Artifact null pointerChristian Kandeler2018-09-051-1/+1
| | | | | | | | | | | | | | This amends 10b8b75f42. Change-Id: I50dcfb8a79cd3a1a7c7baf4b34d15dda7035695a Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Make failure to store the build graph a proper errorChristian Kandeler2018-09-051-1/+4
| | | | | | | | | | | | | | | | If we cannot store the build graph, then that's a hard error. It does not make sense to just emit a warning. Change-Id: Ia4a586c80354266e61a0842b00197eae466c9749 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Fix memory leak in RuleNodeChristian Kandeler2018-09-053-5/+12
| | | | | | | | | | | | | | | | | | When we introduced our "dummy artifact" singleton, we forgot that it gets stored and consequently needs to get deallocated manually in subsequent qbs invocations. Let's use a null pointer instead. Change-Id: If19c6faa46cfcba60e24c84bfd095ade94546dbb Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Merge 1.12 into masterChristian Kandeler2018-09-0411-21/+66
|\| | | | | | | Change-Id: Ia115255ae46772a83c1196fbe291ff295927ee92
| * Fix over-eager sanity checkv1.12.1Christian Kandeler2018-09-041-5/+9
| | | | | | | | | | | | | | It could trigger on legal constructs. The patch amends 9c1aa4ece1. Change-Id: I31eab78fdb58262f2e4935f4eebf4023e4a4adc0 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * Fix invariant in the RequestedArtifacts classChristian Kandeler2018-09-044-13/+14
| | | | | | | | | | | | | | | | | | | | If an artifact map is requested a second time, we need to update the set of all tags if the artifacts map has changed in the meantime. This fixes an assertion in the sanity checks. Change-Id: Iacf8d4376c7a3a356428cc7eb508dbd22e945a8c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * Executor: Fix invalid assertionChristian Kandeler2018-09-035-1/+41
| | | | | | | | | | | | | | | | An artifact whose alwaysUpdated property is false does not need to exist and is therefore not required to have a valid timestamp. Change-Id: I642349c49a53e6e45d6b09d1acc87f4c9a0edae9 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * ModuleLoader: Fix memory leakChristian Kandeler2018-09-031-2/+2
| | | | | | | | | | | | | | One of the allocations was not exeception-safe. Change-Id: Ib367f9f2e5e65d0813465d5dcbf9dc779418bdfc Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | MSVC: Give hint about possible reason for missing import libChristian Kandeler2018-09-047-4/+97
| | | | | | | | | | | | | | | | | | | | If an import lib is unexpectedly not present, the reason is usually that no symbols are exported from the DLL. This is not obvious at all, so catch this condition and explain what is happening. Task-number: QBS-1291 Change-Id: Ia2df8e1a27e0231e855413245703ffc05221722e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Filter references to importingProduct from exported list propertiesChristian Kandeler2018-09-043-11/+27
| | | | | | | | | | | | | | | | It's just a heuristic, because we don't have access to single elements of JS arrays, but it should cover the most common cases. Change-Id: I02f9ff215394d108f7ba52662eff7b4f5e8e1a62 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge 1.12 into masterChristian Kandeler2018-08-317-22/+32
|\| | | | | | | Change-Id: I745a07a3b25abd6c89afcd3b2199119a751e8a0c
| * Store product names in ExportedModuleChristian Kandeler2018-08-316-19/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | ... rather than product pointers. ExportedModule objects can be stored in Transformers, which potentially outlive the referenced products. Alternatively, we could update the product pointers during change tracking, but that would be tedious and error-prone. [ChangeLog] Fixed possible crash on storing a build graph after re- resolving. Change-Id: I09bcf638a17da410198524858eb4c1bda59bebcb Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * Fix potential inconsistency in Artifact dataChristian Kandeler2018-08-102-4/+4
| | | | | | | | | | | | | | | | If safeConnect() returns false, we must not add that "child" to the list of children added by scanners. Change-Id: Icbb1b2d14d99f002e2370ee2bda25daafb0398b2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | qbs build: Allow building with address sanitizerChristian Kandeler2018-08-311-0/+7
| | | | | | | | | | Change-Id: I339f5d986acd99240f388b83bfc29acfd19939ba Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | MSVC: Suppress "performing full link" also for executablesOrgad Shaneh2018-08-291-1/+2
| | | | | | | | | | Change-Id: Ibf544198b23021361d90b3d3c1cdbbbb0651453b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Android: Properly support the aidl toolChristian Kandeler2018-08-278-3/+74
| | | | | | | | | | | | | | | | We now pull in the AIDL framework file and let the user set search paths for imports. Change-Id: I93460a77b064fa87849b93c0b0e4bd3bbfd7459f Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | corelib: Apply modernize-use-nullptrAlessandro Portale2018-08-2016-37/+41
| | | | | | | | | | | | | | Use nullptr instead of 0. Change-Id: Id5b7933844730e244a2dcf3fcebf24f9f048047f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | corelib: Apply modernize-use-overrideAlessandro Portale2018-08-2017-68/+73
| | | | | | | | | | | | | | Add overrides to function, except for destructors. Change-Id: I1a1337b01dfef81b74ba56c5f00bf4d4cfc10935 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | corelib: Apply modernize-use-autoAlessandro Portale2018-08-2019-86/+76
| | | | | | | | | | | | | | Use more auto. Change-Id: I27e1e2345c6bede459a375663be72ec3370a5e39 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 05:39:47 +0000