aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Don't evaluate module properties twice for groups with fileTagsFilter.1.3Christian Kandeler2015-02-171-3/+1
| | | | | Change-Id: Ib7c1f1b6b35a0ca7d5794da72cc1de3d5068eac2 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Amend property evaluation optimization.v1.3.4Christian Kandeler2015-02-161-3/+5
| | | | | | | | | There is code further down in the chain (e.g. setupBuildEnvironment()) that expects the first module instance it finds to contain the right definition for all its properties. So make sure that is the case. Change-Id: I55f10d626f5be7ec8502f54e0b1a9673df0b5d93 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Adapt autotest so that it fails again.Christian Kandeler2015-02-163-2/+5
| | | | | | Task-number: QBS-736 Change-Id: I94a4bd869f289e78816b56d5de974342cc463c6c Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Don't evaluate properties that will never be seen.Christian Kandeler2015-02-132-35/+88
| | | | | | | | | | | | | During project resolving, we can make use of our knowledge of how the PropertyFinder works, skipping evaluation for "shadowed" properties. In the long term, we might want to get rid of the nested modules map altogether and replace it with a "flat" map (with special support for mergeable list values). Task-number: QBS-746 Change-Id: I75f62239daadce1f8826444a2e3b3a51d581df98 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Increase tests timeout to make them succeed on slow hardwareDmitry Shachnev2015-02-122-3/+3
| | | | | | | | | | | | In Debian, QBS failed to build on some architectures (like MIPS) due to timeout error in tests. Increasing the timeout made the tests succeed. See https://bugs.debian.org/774974 for details. Done-with: Dejan Latinovic <Dejan.Latinovic@imgtec.com> Change-Id: I68b24260eefd1cb5cb6486f71a4cd9e9e2f3d2f2 Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Remove invalid assertion.Christian Kandeler2015-02-116-1/+45
| | | | | | | | We can find different values for a scalar property in module prototypes if they are assigned indirectly at some place. Change-Id: I97349cd5879e33133ad85751d76728e9873ff265 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix build.Christian Kandeler2015-02-101-0/+1
| | | | | Change-Id: Ib03cb4dfbe018964629fb48be5f567c67e05c1f1 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* fix scalar property lookup some moreJoerg Bornemann2015-02-104-10/+59
| | | | | | | | | | | | | | | | | | Let there be a product P that depends on module A. Module A depends on module B.A sets B.foo to 1. Default value of B.foo is 0. The value of product.moduleProperty("B", "foo") is 1. Now add the direct dependency B to P. P does not overwrite the default value of B.foo. The overwritten value of B.foo from A takes precedence. This semantics change is needed to make sure that adding/removing modules to a product does not change property values in surprising ways. Task-number: QBS-736 Change-Id: I73152a24649bc670a9075e82998ef2b0d8709a84 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Doc: Add a configuration for online documentation buildsTopi Reinio2015-02-062-1/+21
| | | | | | | | | When the build_online_docs qmake config variable is set, select the correct version of the Qt documentation template and set the copyright notice. Change-Id: I4dc590ebfd2f09b49ff808efe1ac26d3ee228887 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Add XFAIL'ing autotest.Christian Kandeler2015-02-032-0/+2
| | | | | | Task-number: QBS-736 Change-Id: I69ae2f62c1258774fc0a2558aba5ec2b145431b9 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix removeFileRecursion().Christian Kandeler2015-02-034-2/+43
| | | | | | | | Neither symlinks to directories nor broken symlinks were handled correctly (due to QFileInfo weirdness again). Change-Id: I652e677643273c9d57f98d87b652483a870dcd0c Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Add documentation for Process::setCodec().Christian Kandeler2015-02-021-0/+8
| | | | | Change-Id: I9898bc60abda04cdec42d91d0c5f3c9cdd934600 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Fix Qt 4 build.Christian Kandeler2015-01-291-1/+1
| | | | | Change-Id: I11cd4f2ec1baad00d2a02355419a161ccf8b6b31 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* fix look-up of scalar propertiesJoerg Bornemann2015-01-298-50/+98
| | | | | | | | | | | | | | | | | The property map of a product used to contain all modules of the dependency tree as direct children. The same was true for the product's Item. This setup was done in ModuleLoader::createAdditionalModuleInstancesInProduct. The whole approach led to problems when retrieving module values from modules deeper in the dependency hierarchy. Basic idea of this fix is to make ProjectResolver::resolveModule recursively walk the module dependency tree instead of trying to gather information on the root level. Change-Id: Icf1325272f90d7924437f41ca6f403d7264ce84c Task-number: QBS-726 Task-number: QBS-706 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Fix the PropertyFinder.Christian Kandeler2015-01-291-1/+1
| | | | | | | The "searchRecursively" argument must be passed through. Change-Id: I69794d8b9ebd1e9fa520890afae15430b22af143 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* enhance error message for failing environment setupJoerg Bornemann2015-01-281-1/+1
| | | | | | Change-Id: Ia542e2ffe1fe2d4d89fd2da62bf7d465cf040014 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* remove unused variableJoerg Bornemann2015-01-281-1/+0
| | | | | Change-Id: Ic9a41cc4b78a860d0f275d3525f47a102faac887 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* fix caching for properties transitively dependent on productJoerg Bornemann2015-01-275-3/+46
| | | | | | | | | | Let there be property A using the product identifier on the right hand side. Let there be property B using A on the rhs. B must also be considered as dependent on product. Change-Id: I237ce7103e0707f6a1bc99bc0195ec714da04116 Task-number: QBS-729 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Do not insert into module property cache if caching is disabled.Christian Kandeler2015-01-261-1/+2
| | | | | | | | | The current code does not seem to result in observable issues, but it can't possibly be right to retrieve a value from the cache that was inserted while caching was off. Change-Id: I6db84652014b155f93056e48d52915c846892560 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Update LicenseEike Ziller2015-01-26457-2692/+2692
| | | | | Change-Id: I092fca9f950de1ba38826c33b155f86feae2770b Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* more fine-grained cache disablingJoerg Bornemann2015-01-219-8/+46
| | | | | | | | | | | | Disable caching only for properties that reference product in some way. This fixes the performance regression introduced by 0d477159e6. Additionally, the property cache in ModuleProperties must be disabled too. Otherwise we might return wrong cached values. Task-number: QBS-729 Task-number: QBS-732 Change-Id: I4c46e4c5ddf20053851d7ee5e9a51f6f3f082a6d Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* fix product variable in Export itemsJoerg Bornemann2015-01-207-24/+111
| | | | | | | | | | | Consider a module M that's exported by Product B. Product A depends on product B and thus depends on M. This patch fixes the product variable in M that was referring to the exporting product B, not the importing product A. Task-number: QBS-729 Change-Id: Ia30b7159aa5d5ec37fe6257300e6c16205141f86 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* clean up TestBlackbox::exportWithRecursiveDependsJoerg Bornemann2015-01-194-2/+1
| | | | | | | | We don't need qbsSearchPaths here, and there's a JIRA issue we can reference. Change-Id: Ieae9d810e484e2011d599d213630f03c9aa7a796 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Add missing files for autotest.Christian Kandeler2015-01-191-0/+7
| | | | | | | Forgotten in bdbe0bf723. Change-Id: I8c04ea8d02d988deec108ef8346c4b8504b121d7 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix project parse error.Christian Kandeler2015-01-195-7/+39
| | | | | | | | | | Access to qbs properties was magically available even before loading the qbs module (for reasons beyond my knowledge), but this only worked when no qbs properties were set in the product. Task-number: QBS-728 Change-Id: If4323d4bd390d561b788538af7e69fca042a7f02 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Add XFAIL-ing autotest for newly discovered bug.Christian Kandeler2015-01-162-1/+6
| | | | | | Task-number: QBS-729 Change-Id: Iad875ff8910141976b6359a9927ec340622475d2 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Add XFAIL-ing autotest for bug.Christian Kandeler2015-01-156-0/+45
| | | | | | Task-number: QBS-726 Change-Id: Ie4f3bce7a32b556058f01470b1a272ead528a30a Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* remove superfluous project variableJoerg Bornemann2015-01-131-1/+1
| | | | | | | There's no project variable directly beneath the Project item. Change-Id: I31d158a6d291200b2bb4d739617752a6ab88dd2a Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* update leaves for invalidated artifactsJoerg Bornemann2015-01-136-5/+15
| | | | | | | | | Artifacts that get invalidated by rules must be considered as source for new leaves in the executor. Task-number: QBS-723 Change-Id: I6a6f40725103f1f4a917d3e71f968dc355f8a763 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Add failing autotest for newly discovered bug.Christian Kandeler2015-01-124-0/+69
| | | | | | | | | | | | Task-number: QBS-723 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> (cherry picked from commit 49f4c6114c80d77ba9e16c17e6eae46eeae52bf5) Conflicts: tests/auto/blackbox/tst_blackbox.h Change-Id: I6cf98fac6c32a297e409bf4916761d3b7c6a9828 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Fix compilation with latest qtbase/devKai Koehne2015-01-071-1/+2
| | | | | | | QDataStream isn't included through QStringList anymore. Change-Id: I296af040e1c856b186df883f7fdc3e8ac10fd16a Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* fix MinGW 4.6 detectionJoerg Bornemann2015-01-061-3/+5
| | | | | | | | | | MinGW32 4.6 returns "mingw32" as platform string, which is not a triplet. This was not handled properly. Change-Id: Ia44eeebf7a527cfac896020a990093c35d3554ed Task-number: QBS-716 Reviewed-by: Smirnov Vladimir <mapron1@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* fix setup-qt for debug/release builds of QtJoerg Bornemann2015-01-062-10/+9
| | | | | | | | | | | There's a debug build of Qt available iff QT_CONFIG contains debug. Analogous for release. The debug_and_release value is independent from this and doesn't appear at all in Qt4 debug/release builds. Change-Id: Idcdf19987bedaa16ee1507de1f17f5137ebf1ee6 Task-number: QBS-717 Reviewed-by: Smirnov Vladimir <mapron1@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Disable smart relinking for mingw.Christian Kandeler2015-01-051-0/+7
| | | | | | | | The nm tool shipped with mingw does not produce sensible output. Change-Id: I9404016744233e69746063c63c4190108c10e763 Task-number: QBS-720 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix NSIS version number detection.Jake Petroules2015-01-051-1/+1
| | | | | Change-Id: Ia844e1090c5845bc39ab2b747ec017dc295f92b0 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* fix compilation with minimal Qt configurationJoerg Bornemann2014-12-234-0/+5
| | | | | | | | Add missing includes. Change-Id: I8473af332919ef4c2d9e66f56c6d15b136ec3a54 Task-number: QBS-719 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Fix property look-up.Christian Kandeler2014-12-191-1/+1
| | | | | | | | | | We must not stop searching for the property just because the respective module is present in the product; the property itself must have been found as well. Change-Id: Icc4fb019094909f1da26d649dcbe54d76a09f2d0 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> (cherry picked from commit fdad8a2b0566847680da445f7ff920ad88da9171)
* fix duplicate libraries in MSVC linker commandJoerg Bornemann2014-12-191-14/+19
| | | | | | Change-Id: I3e52c1813e978cc62021b9d35f3af6dd8b90d656 Task-number: QBS-710 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* fix duplicate libraries on gcc command lineJoerg Bornemann2014-12-181-6/+12
| | | | | | Task-number: QBS-710 Change-Id: I935f8d4033d5be37bbf13c79b0225a57539d196b Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Fix mingw Qt setup.Christian Kandeler2014-12-171-1/+6
| | | | | | | | Semantic inconsistency #3287 in prl files. Task-number: QBS-714 Change-Id: I3f92d0bab4136324f5954a96981d575c77ba7f5f Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix ResolvedFileContext comparison.Christian Kandeler2014-12-152-2/+4
| | | | | | | The order of JS extensions and imports does not matter. Change-Id: I452e8e6e64f588b061211031968d5741c01339d8 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Doc: remove confusing statementJoerg Bornemann2014-12-111-2/+0
| | | | | Change-Id: I1de18c333ada7bc364c56b1e2b2fa3250763a1fc Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Version bump.Christian Kandeler2014-12-112-2/+2
| | | | | | | To 1.3.4. Change-Id: I61cf11cd02f3c3f3931420dbeae00f064dfc0c61 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* fix release-with-debug-info build with MSVCJoerg Bornemann2014-12-021-1/+1
| | | | | | | | | Make debug/release runtime decision dependent of qbs.enableDebugCode instead of qbs.debugInformation. Change-Id: Ifc3b134f8979f2196ef58d8b1603104859f62736 Reviewed-by: Thomas Epting <thomas.epting@stryker.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Sort inputs and outputs before setting up the respective JS lists.v1.3.3Christian Kandeler2014-12-011-0/+9
| | | | | | | | | | | | | | | | If we don't do that, the order of inputs/outputs is random. Why is this bad? Consider a linker rule. Depending on the phase of the moon, the command line can look like this: ld -o myApp obj1.o obj2.o Or like this: ld -o myApp obj2.o obj1.o As a result, change tracking will yield false positives. This is very likely the reason for seemingly inexplicable re-linking steps observed in the past. Change-Id: Iec9d340579dbd680eca07e228bf42339d6e7d277 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix potential exception leak.Christian Kandeler2014-12-011-3/+2
| | | | | Change-Id: Iddb70d32bd44a4282b2e5ebd809582344917c1ca Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Catch exceptions by const reference.Christian Kandeler2014-11-281-2/+2
| | | | | | Change-Id: Ib155b1b6f4e5d618d6e3143f43a2e7f9e7e1d410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* qtprofilesetup: Fix detection for DataVisualization module.Christian Kandeler2014-11-271-4/+5
| | | | | | | This one also uses a different naming scheme for some reason. Change-Id: I47a419e85f8f8eba5559da2c896e2660b80284c2 Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
* Throw a proper error when encountering invalid outputArtifact values.Christian Kandeler2014-11-211-1/+4
| | | | | | | | A user can easily trigger this condition, so we can't assert on it. Change-Id: Id26ee13dbcea6207da316f454ecf357a284be2da Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Fix compilation on Windows.Christian Kandeler2014-11-201-2/+2
| | | | | | | Q_NORETURN belongs *before* the rest of the function declaration... Change-Id: Ib91cc7902f35acdb42d0039998b02b8f26f96eea Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 23:50:20 +0000