aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix inadvertant module prototype sharingv1.10.0Christian Kandeler2017-11-235-5/+33
| | | | | | | | | | A product that is not multiplexed in the sense that additional instances of it are created can still alter prototype values. Take this into account when deciding whether to re-use an existing module prototype. Task-number: QBS-1243 Change-Id: I017fc0dc9d6080d622b030e97796d254d17b3468 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix bogus error message about conflicting module filesChristian Kandeler2017-11-232-0/+12
| | | | | | | | This could happen if the same location appeared in the search path in different forms. We now canonicalize the paths. Change-Id: Ide20886e88469fbbabc74f2814754b85983e6780 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Ignore property assignments in Export items of disabled productsChristian Kandeler2017-11-2312-1/+138
| | | | | | | | | Ideally, we would also ignore Depends items in such Export items, but that task seems to be a bit more involved. Task-number: QBS-1250 Change-Id: Iab74873f74d5b8f0b8771c3c1866c7a1a5fa78aa Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix default deployment target of storyboard in assetcatalog testJake Petroules2017-11-131-1/+1
| | | | | | | It should be set to 'default deployment target'. Change-Id: I0022317044c72a5f1d27fe5a1cc902fb3901d2ce Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix assetcatalog test with newer versions of macOSJake Petroules2017-11-132-6/+19
| | | | | | | | | The default deployment target handling has since changed in a way such that we cannot assume the 'default' target is the current host version. Therefore, make the test explicit about the required deployment target. Change-Id: I2547c6051def619dba8b9e6f18b26942fc6707cd Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Make the teapot test a little less strictJake Petroules2017-11-131-6/+11
| | | | | | | | | | | | | Make 'unexpected files encountered' only a warning instead of an error; it's possible and has historical precedent in the Android samples. Further, remove th ic_launcher.png files from the list of required files of the teapot example. These became mipmaps instead of drawables at some point and it is not worth the effort to try to create a proper conditional to select the right list of files. Change-Id: If71bc394e64c19448c152b905ecff29dd436d190 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Only include one of gl3stub.cpp or gl3stub.c in the Android teapot testJake Petroules2017-11-131-1/+2
| | | | | | | | | The .c file was renamed to .cpp at some point, but both copies remain in the samples repository. Listing both will result in duplicate gl3stubInit symbols during linking. Change-Id: Ifb9bbbdb9b955bc3811aa5d0bb5ce722bf6c3565 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Rename CoreUtils in install-bundle exampleJake Petroules2017-11-131-3/+3
| | | | | | | That name conflicts with an Apple system framework. Change-Id: I9d8c1f3fdff813341e433578e4e48aac607a1e39 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix the outer value for Properties itemsJoerg Bornemann2017-11-104-28/+74
| | | | | | | | | | | | | The outerItem we created contained just one property and was quite fragile when the 'outer' source code contained references to other properties, especially whenever item inheritance was involved. We now directly obtain the value of outer as soon an alternative requests it. Task-number: QBS-1239 Change-Id: I07f9ff85f33b445515b97f7c6f3d4f917fe3ccc8 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix check for the "same file as different artifact" case in connect()Christian Kandeler2017-11-095-2/+89
| | | | | | | | | That can legally happen if the child artifact is a source file present in different products. Task-number: QBS-1241 Change-Id: Ideba1321072deee5c01b8915f32a747b45864793 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix evaluation of Properties.conditionJoerg Bornemann2017-11-084-111/+124
| | | | | | | | | Use the same code path for the evaluation of Properties.condition and the actual values. Task-number: QBS-1240 Change-Id: I1cfb2e13349d73bf347bf90ee5aef4b0835630f6 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* SVConverter: Bail out early if the importScope is erroneousJoerg Bornemann2017-11-081-8/+7
| | | | | | | This simplifies the code quite a bit. Change-Id: I07a6667276650c4b4d17bd667dd9f8f1c0f753aa Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* SVConverter: Factor out the creation of the extra scopeJoerg Bornemann2017-11-081-33/+47
| | | | | | | Clean up the handler function for JSSourceValue objects. Change-Id: I04fd79c8c03016c5656f7f392e0e27388215e928 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix import search path precedenceChristian Kandeler2017-11-089-1/+37
| | | | | | | | Items located lower in the search path stack would overwrite existing, higher-priorized entries. Change-Id: Ie7660428cf6f0969bf880941344a9f88cdb51021 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Yield error if Rule.outputArtifacts has invalid elementsJoerg Bornemann2017-11-067-4/+79
| | | | | | | Check for validity of filePath and fileTags in Rule.outputArtifacts. Change-Id: Id153695e8788732a40e6e5acb21a6d8b7f07f6e7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix change tracking for rules with more than one commandChristian Kandeler2017-11-063-2/+6
| | | | | | | | We have to accumulate the accessed properties, otherwise the ones from the previous command will be overwritten. Change-Id: I094327f1bc31ec19770747a70e62461fa46d8e98 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix handling of empty JS filesChristian Kandeler2017-11-065-1/+24
| | | | | | | We would crash on those. Change-Id: I06ddfacfcea53d7a65cbd30a1b697cf09e28b82d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Include file dependencies in artifact rescue dataChristian Kandeler2017-11-027-1/+53
| | | | | | | | | | These were just getting lost. Alternatively, we could always do a re- scan of rescued artifacts, but that would be unnecessary most of the time, and scanning is an expensive operation. Task-number: QBS-697 Change-Id: I49f1a7b5b5c1a1691cb9f97e553b2b1b98fab3bd Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix File.move() and add autotestChristian Kandeler2017-11-013-6/+13
| | | | | | | | | | | | This function did not work for even the simplest case, which went unnoticed as there was no test coverage whatsoever. Problems fixed: - The operation failed if the destination file did *not* exist. - The operation failed if the source file was not readable. Task-number: QBS-1216 Change-Id: I7b4ed7493d36d19807ed9a72f113b929565f7f4b Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix releasing of script resources for Rule.outputArtifactsJoerg Bornemann2017-10-261-1/+1
| | | | | | | | | The evaluate call just creates the function object for outputArtifacts which is called later. We must release resources after the actual function call. Change-Id: I2013226bf57d2c892127824fc900a4802154b1c6 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Remove sync.profileJake Petroules2017-10-232-5/+1
| | | | | | | | These are now totally obsolete. Change-Id: Ic7581005787cfb9196518bfd9cb3be26d60b3d22 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Only add /System/Library/Frameworks to default compiler path on DarwinJake Petroules2017-10-232-3/+5
| | | | | Change-Id: Ia9ce8fbe4120d4dac562083b7181dce98128db48 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* CLI: Better message when building for the first timeChristian Kandeler2017-10-231-2/+4
| | | | | | | The old one looked too much like an error message. Change-Id: I754b582ee85970fc871178dff484eaaf98659a81 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix FileSaver and add some autotests to make sure it worksJake Petroules2017-10-205-16/+173
| | | | | Change-Id: I707edb703068868014b4434b7508bfa41617383c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Check return values of sanitizedListProperty()Joerg Bornemann2017-10-192-6/+18
| | | | | | | | | | | | | This function can return other things than Array objects. Check the return value before passing it to concat. This fixes evaluation errors in the following situation: Product A depends on product B, and - B provides staticlibrary or dynamiclibrary artifacts, and - B does not have a cpp dependency. Change-Id: Id59988ed8846564e0590be6dacdda154a59d0b61 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Close process launcher on socket disconnectChristian Kandeler2017-10-191-0/+1
| | | | | | | | | | If the qbs process closes the socket without sending a shutdown packet, it means it got killed or is otherwise malfunctioning. The launcher also needs to stop then, or it will hang around indefinitely. Change-Id: I9d3f4abcc4a1f9a929b700b7d2650b16831103ab Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Also tag .qdocinc files so they participate in dependency trackingJake Petroules2017-10-191-1/+1
| | | | | | | | This fixes an issue where changing a qdocinc file in a Qt documentation project would not cause the documentation project to be rebuilt. Change-Id: If9c06348baee22e7af86dfb2cff9622ae529df74 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Android autotests: fix default architectureJake Petroules2017-10-191-1/+1
| | | | | | | Amends 8d0b530 Change-Id: Idcb3a05ab344914124d5eeb9811651b9ed9d1e83 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix detection of binutils locationJoerg Bornemann2017-10-181-1/+1
| | | | | | | | The binutils probe's condition was reversed in a refactoring accident (commit 2856d903). Change-Id: I52f01bd98a75c31fb8cd3d51226aa90b2b1c866d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* CLI: Check generator name before buildingChristian Kandeler2017-10-182-20/+31
| | | | | | | | | We can and should detect invalid generator names before starting a potentially expensive operation. Task-number: QBS-1194 Change-Id: I3588df48b7f3e3d7d085a2e4b620296f5eaf02c9 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Allow the qbs.Xml extension to work in JavaScript filesJake Petroules2017-10-174-7/+17
| | | | | | | | | | | | | | | We must return a valid object. Also, make the constructors of XmlDomDocument and XmlDomNode members of the returned object instead of polluting the global scope. [ChangeLog] XmlDomDocument and XmlDomElement are deprecated and will be removed in the 1.12 release. Use the names Xml.DomDocument and Xml.DomElement instead, which are also now available in JavaScript files as well as in a QML context. Change-Id: I82e3e33c52ac7c8fdf9ba9c27491088d643b07f7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Polish examples/collidingmiceJoerg Bornemann2017-10-171-8/+7
| | | | | | | | Use proper installation instead of destinationDirectory, and use a simpler style for the Qt.widgets dependency. Change-Id: I3dbed37c55e9064b0497c03933536ffcbc224cd7 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Polish examples/app-and-libJoerg Bornemann2017-10-173-4/+5
| | | | | | | | | Assign sensible names to the products, fix the style of the project files and add some more descriptive output. Change-Id: Icdca5e8c32cfef767aa18abc2dd9c4688880c2ba Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* setup-qt: Give feedback to the user if no Qt installations were detectedChristian Kandeler2017-10-171-0/+5
| | | | | | | Task-number: QBS-1220 Change-Id: I8e99daf145c8255ca3233ca54cf9eb9d3cd84165 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Fix makefile warning "overriding commands for propertylist.moc"Jake Petroules2017-10-171-2/+2
| | | | | Change-Id: If72e3d927901a67a8d5cd5f0a1d469750bb379b7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix unused function warningJake Petroules2017-10-171-1/+1
| | | | | Change-Id: Ia38d236ca94681801cdd4561b4bc07f8a97aa2bd Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* GCC support: Remove unused function from JS fileChristian Kandeler2017-10-171-11/+0
| | | | | Change-Id: Id743303203f267418ce68ebd57799b676681a721 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Improve error messages for the generate commandJake Petroules2017-10-161-7/+10
| | | | | Change-Id: Ifdd203c6bb1617916c79f7533fb52e9f2859d5e4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix the build with MinGWJake Petroules2017-10-162-3/+4
| | | | | | | | | | | | codecvt is an internal MSVC header which is included by the standard C++ header "locale", and stdlibc++ prior to GCC 5 is missing functionality from locale. In any case, we'll assume stdlibc++ on Windows takes care of encoding issues, even if it doesn't. Change-Id: I6667af9737510c6b8ffa80325b84279d36b781e3 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add missing dependencies for the qbs archive packageJake Petroules2017-10-161-2/+3
| | | | | | | | | qbs-create-project, the generator plugins, and the man page (on Unix) will now be added to the archive packages. Task-number: QBS-1218 Change-Id: Idad9f71ef5c1f91ab1b5b620d95cac0c1b9a85e5 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add changelog file for 1.10.0Christian Kandeler2017-10-161-0/+43
| | | | | Change-Id: Ia0b344ab50b49cf457df4338b70c10167cd19d51 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Properly split newlines from gcc and nm output on WindowsJake Petroules2017-10-161-3/+3
| | | | | | | | | | | | This fixes an issue (and probably undiscovered others) where qbs.architecture could be defined as, for example, "avr2\r" due to the fact that output was always split on \n and not on \r\n on Windows. Task-number: QBS-1217 Change-Id: If5d1af238394b950545990318fb12b343aa67072 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Remove superfluous use of QScopedPointer in RunEnvironmentJoerg Bornemann2017-10-131-7/+5
| | | | | | | | The QTemporaryFile object can be created on the stack. Change-Id: Ief886edfff21681b2b2f6ffb425664b511d3c611 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Remove unused Logger from EvaluatorScriptClassJoerg Bornemann2017-10-133-7/+3
| | | | | | Change-Id: Iea8fbf520bfce086362aa86fc5cc1ae17db216cc Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix return value of VsEnvironmentDetector::startJoerg Bornemann2017-10-121-3/+6
| | | | | | | | This function always returned true. Instead, it should return false if all detection attempts failed. Change-Id: I9bf15f6b4f4448570e362dd232e1cdd7dc244760 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Remove superfluous qAsConst callJoerg Bornemann2017-10-121-1/+1
| | | | | Change-Id: I132e653dc29901d27d6d687905894b6a6108e5cc Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add missing mutex to JobObserver classChristian Kandeler2017-10-121-2/+13
| | | | | | | | The cancel() call can come from a different thread. Change-Id: I3450dad49917f0efc3826924e7b780bae31ead66 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Emit better error message if process launcher fails to startChristian Kandeler2017-10-111-2/+7
| | | | | | | | | We now tell the user that starting the launcher already failed and where we expected the launcher to be. Task-number: QBS-1210 Change-Id: I4fab1963735219515cbafb2b01d5992ee124d00c Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Do not reset the "canceled" state when initializing an observerChristian Kandeler2017-10-111-1/+0
| | | | | | | | | We never re-use a canceled observer, and resetting can lead to race conditions in build jobs. Task-number: QBS-1210 Change-Id: Ifab79b614c448d2fffc20395934405711524a30f Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Add missing <locale> include in iosutils.hJake Petroules2017-10-101-0/+1
| | | | | | | | This is needed for std::wstring_convert. Task-number: QBS-1212 Change-Id: Ic650b4fb0b1e07ec007d4fb142661f06a2bb50a4 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 22:56:53 +0000