aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/qtprofilesetup
Commit message (Collapse)AuthorAgeFilesLines
* Change the default value and behavior of Qt.core.resourceSourceBaseDenis Klychkov2016-12-021-3/+4
| | | | | | | | | | | | | | | | | | | The default value "undefined" tells the qrc file generator to use only the input file name as a resource alias. The benefits of changing the default value are as follows: 1) It's a bit weird to reset a normal value to undefined in qbs code. 2) This simplifies feature usage for output Artifacts and single files. 3) If one wants to put a hierarchical structure into a qrc file there are a lot of cases in which they have to specify resourceSourceBase manually. 4) When a Group with a wildcard and a prefix is used this makes user's intention a bit clearer. This strongly separates "I want this set of files" from "I want this directory structure". Task-number: QBS-1053 Change-Id: Ib6413643398dca475b4b71ad884202c9e7fb823a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add possibility to specify the base name of the generated qrc fileDenis Klychkov2016-12-021-1/+4
| | | | | | | Task-number: QBS-1043 Change-Id: I5f537f148792b0e2647d08d6e8004d79ae402f07 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Accurate handling of Qt.core.resourcePrefixDenis Klychkov2016-11-281-9/+20
| | | | | | | | | | | Previously the value of this property was taken only from the first input. That value became the only prefix for the whole qrc file. Now every unique value of resourcePrefix generates new <qresource> tag with the corresponding prefix. Change-Id: I2177b3bc38085014c41107225bcb4bd4c51ba58b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Fix Qt 5.6+ main() support for iOS and tvOSAndrew Knight2016-11-251-2/+9
| | | | | | | | Don't link to qtmn in Qt 5.6; in that version it has been superseded by setting the entry point to _qt_main_wrapper. Change-Id: I9941f7347ffbe530550430ce93e1867edbc0985a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Do not use fromLocal8Bit() for string literalsKai Koehne2016-11-081-1/+1
| | | | | | | | | | The current locale encoding does have nothing to do with string literals. Use fromLatin1(), which tends to be the fastest for ASCII. Change-Id: I9f1ff603f26812a63e5b23a413ba240c47d5ac23 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add support for generating qrc filesChristian Kandeler2016-10-281-0/+39
| | | | | | | | [ChangeLog] Added support for generating qrc files. Change-Id: I9c5d703fcb6f8c14606d5abf66e8edfd4959f364 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Add support for the QtScxml moduleChristian Kandeler2016-10-203-0/+71
| | | | | | | [ChangeLog] Added support for QtScxml module. Change-Id: I1ad8d51a3d9532d4a24270e4cc13f26f51620b07 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Modules: Adapt to introduction of built-in "version" propertyChristian Kandeler2016-10-192-2/+1
| | | | | | | | - Remove redefinitions of the property. - Set the property, where applicable. Change-Id: Ie3f4bd3c4cc9b809667287045c10b22ff6b71e21 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Merge 1.6 into masterChristian Kandeler2016-09-051-3/+8
|\ | | | | | | Change-Id: Ica9e01e8dc03fe0d36568a270bbad9b85919c952
| * Do not use compiler include paths with moc from Qt 4.8Christian Kandeler2016-08-291-4/+9
| | | | | | | | | | | | | | | | | | This moc is too old to parse certain header files correctly. Task-number: QBS-1004 Task-number: QTCREATORBUG-16798 Change-Id: Ic0c7787112d9ab5d334b62ea5c56014d6cd5892f Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Update license headersIikka Eklund2016-08-292-28/+46
| | | | | | | | | | | | | | | | | | | | Patch-set 2 includes *.cpp *.c Every source file needs to have up-to-date license headers in order to pass ci. Change-Id: Ie6e493097af6f7dd6a8adff170eb856f496e689e Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Update license headersIikka Eklund2016-08-293-42/+69
| | | | | | | | | | | | | | | | | | | | Patch-set 1 includes *.h Every source file needs to have up-to-date license headers in order to pass ci. Change-Id: Ib6cf3ac47dfba6dff262fded44bc952aef3bda8b Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Merge 1.6 into masterChristian Kandeler2016-08-191-0/+2
|\| | | | | | | Change-Id: Id711e244f207d6c4f08e240ef4c033f344b530fc
| * Qt.core: Default to C++11 for version 5.7 and abovev1.6.0Christian Kandeler2016-08-191-0/+2
| | | | | | | | | | | | | | | | C++11 is required from Qt 5.7 on. Users shouldn't have to enable this manually in all their Qt-based products. Change-Id: I2cdbe393f62c9930cd74f129d0c14c109203425e Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Deprecate the "moduleProperties" functionChristian Kandeler2016-08-041-5/+5
| | | | | | | | | | | | | | | | Ever since we introduced module merging, there has been no difference between moduleProperty() and moduleProperties(). Change-Id: I3f9a9df3f24bf971828e774a5f687356509df2ca Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Qt.core: Keep the generatedFilesDir property around for a bitChristian Kandeler2016-08-041-0/+1
| | | | | | | | | | | | | | It's actually used outside of qbs (namely, in Qt Creator). Change-Id: I3bf6f9a2d4f81f30f72efdb5afeecb20772fedb7 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Qt modules: Use separate output dir for generated headersChristian Kandeler2016-08-034-15/+16
| | | | | | | | | | | | | | | | It makes sense that the directory we add to the list of include paths contains only files that are actually intended to be included. Change-Id: I360617701976bf6dda2c95ecaa25bf1a4b8a8867 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Qt.core: Add property for setting extra plugin metadataChristian Kandeler2016-08-012-0/+3
|/ | | | | | | Task-number: QBS-998 Change-Id: I8f3999078bc3fec2001b5ffec9b1f51ba9848b56 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Qt.core module: Add property for passing extra options to mocChristian Kandeler2016-07-272-0/+2
| | | | | | | | This is needed sometimes. Task-number: QBS-998 Change-Id: Idd15f79ec8996b4df5311425727e38ea8d6eebae Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Extract toJSLiteral functions from scripttools.{h|cpp}Joerg Bornemann2016-07-061-1/+1
| | | | | | | | | The toJSLiteral functions do not use QtScript and are needed by libqtprofilesetup. This extraction is needed to remove the QtScript-dependency from libqtprofilesetup in a subsequent commit. Change-Id: Ide1737269d4b98f38eee93cdf9b6c33a6967c91c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge 1.5 into 1.6Jake Petroules2016-06-282-8/+8
|\ | | | | | | Change-Id: If1a2c368170d89d5e6e11b08a32b37901d51eb1d
| * Do the OS X to macOS rename.v1.5.2Jake Petroules2016-06-272-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog] The "osx" value in qbs.hostOS and qbs.targetOS has been replaced with "macos". For backwards compatibility, qbs.hostOS will still contain "osx" in addition to "macos", and an error will be printed if qbs.targetOS contains "osx" but not "macos". Specifying "macos" without "osx" is allowed. These checks are subject to be removed in a future version of qbs, so update your hostOS and targetOS checks accordingly. [ChangeLog] cpp.minimumOsxVersion has been deprecated and replaced with cpp.minimumMacosVersion. cpp.minimumOsxVersion is subject to be removed in a future version of qbs, so update your projects accordingly. Change-Id: I479891829dff6eb6750cb2a04e1395f085896f63 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Merge remote-tracking branch 'origin/1.5'Joerg Bornemann2016-06-088-8/+8
|\| | | | | | | | | | | | | | | Conflicts: doc/reference/items/transformer.qdoc share/qbs/modules/cpp/GenericGCC.qbs Change-Id: I45560834560019b18274c373c45651eb8aadd206
| * Replace 'the Qt build suite' with 'Qbs' in copyright notices.Jake Petroules2016-06-068-8/+8
| | | | | | | | | | | | Change-Id: I885d94bb14b325dc36767a840ebdb0be1fb59dd2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | qbs build: Move build config properties into a dedicated module.Christian Kandeler2016-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | Qt Creator will do the same in order to be able to build plugins that are not part of the main source tree. This means the qbs build and install settings can no longer be controlled by properties in a higher- level project file, but need to come from a module. Change-Id: I20c0a4538395c8ee838b33f35be84ee59f601f90 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Determine the compiler's default include and lib directories.Jake Petroules2016-06-061-0/+4
| | | | | | | | | | | | | | | | This fixes an issue where moc may fail to find some headers when building Qt or projects that use Qt. Change-Id: I52981139a3127539a4d5d9ba6e8d61575f7a0082 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | Deprecate the Transformer item.Christian Kandeler2016-05-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | When dynamic rules were introduced, transformers became second-class citizens. They do not play well with rules, they introduce annoying additional code paths in the implementation and they are plain broken in several aspects. Now that rules with no inputs are supported, we don't need transformers anymore. Task-number: QBS-885 Change-Id: I316d8cffc91bb529f82350edc0b08358a80ae3fd Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/1.5'Joerg Bornemann2016-05-061-0/+3
|\| | | | | | | Change-Id: Id80f889136961e0353982503c54d88ce6e929e0f
| * Fix missing import in moc.jsv1.5.0Joerg Bornemann2016-05-061-0/+3
| | | | | | | | | | Change-Id: Iaba0d59741355b70923c24e8f9bc502c3db4856e Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | Merge remote-tracking branch 'origin/1.5'Joerg Bornemann2016-05-037-3/+141
|\| | | | | | | | | | | | | | | Conflicts: src/lib/corelib/jsextensions/environmentextension.cpp src/lib/corelib/language/scriptengine.h Change-Id: I77e4626218612656d0963d1bfc643d9f9e7f4edd
| * Fix qmake build with icc on Windows.Christian Kandeler2016-05-022-2/+2
| | | | | | | | | | | | Task-number: QBS-967 Change-Id: I8a0bd11886b4e5b36d6800d0bba58c3edaf63d5f Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Fix DBus adaptor/interface support.Christian Kandeler2016-04-292-4/+13
| | | | | | | | | | | | | | | | | | It's not the base name of the qdbusxml2cpp input file that is used for the output, but, naturally, the lower-cased second-to-last part of the file extension. Change-Id: Ib6fbd8c20f4e50ea1a641a2ee6a15acec710748c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Fix DBUS module on Windows.Christian Kandeler2016-04-271-2/+7
| | | | | | | | | | | | | | | | | | The qdbusxml2cpp tool fails silently when the header file it should create has an absolute path. So use just the file name and set the working directory accordingly to appease this clever tool. Change-Id: Ifae56341c41e22b90fd49fe33efe8430a8911ab8 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * DBus module: Add support for the qdbusxml2cpp tool.Christian Kandeler2016-04-274-0/+122
| | | | | | | | | | | | | | | | This brings feature parity with qmake regarding the (undocumented) DBUS_ADAPTORS and DBUS_INTERFACES variables. Change-Id: I6c7a2278308e5eb44b4582f33615100def21d84c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Fix use of qdoc with unrecognized file types.Jake Petroules2016-04-261-1/+3
| | | | | | | | | | | | | | Also, improve the error message when this happens. Change-Id: If7a398e7dec83a8697e231df39392d6c2d904674 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | Remove items scheduled for removal in 1.6.Jake Petroules2016-04-221-1/+0
|/ | | | | Change-Id: I4098b281ab9c1f5bc29fe23164dd3a3303759ce0 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Fix library file path generation.Alexander Polishchuk2016-03-261-3/+4
| | | | | | Task-number: QBS-938 Change-Id: I52952624cfbf111c98dfc64d6e1ead5b691edad6 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Qt templates: Fix lrelease rule.Christian Kandeler2016-03-141-1/+1
| | | | | | | | We cannot use product.moduleProperty() in a property of a Rule, as these are evaluated at resolve time. Change-Id: I6670a7cfee8fee51e9796207449510d86c0464db Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
* libqtprofilesetup: Adapt to new Qt module pri file contents.Christian Kandeler2016-02-091-5/+7
| | | | | | | | | | The include paths for framework builds are correct from 5.6.0 on and our workaround is no longer needed. The actual result should be exactly the same (for now), but we hardcode fewer assumptions. Change-Id: I42df799df2da598c7f6c7d5510f757e46cd08eb5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
* Merge 1.4 into master.Christian Kandeler2016-02-091-0/+8
|\ | | | | | | Change-Id: Id393f8a3dccb58fd9689d9fcb761be77db7d346a
| * libqtprofilesetup: Adapt to new pri file format for Qt modules.Christian Kandeler2016-02-051-0/+8
| | | | | | | | | | | | | | | | | | | | In Qt 5.6, the "no_link" entry is no longer used to indicate that a module has no corresponding library. Instead, now the presence of a ".module" line tells us that the module *does* have a library. Change-Id: I75d9feebec92e2c389a41477ccb47d00bc66b5f4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | Merge 1.4 into master.Christian Kandeler2015-12-151-4/+7
|\| | | | | | | Change-Id: Id67a9d50695cab318b06bbf252bcf7368c0530a5
| * libqtprofilesetup: Adapt to Qt 5.6 prl file change.Christian Kandeler2015-11-181-4/+7
| | | | | | | | | | | | | | Task-number: QBS-908 Change-Id: I16c2ea7ade8f3be0c1cb18acbe06c737c359cad5 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Qt Core module: Make the lrelease rule optionally a multiplex rule.Christian Kandeler2015-11-191-6/+17
| | | | | | | | | | | | | | | | | | | | lrelease takes a number of ts files and produces a qm output, so it is technically a multiplex rule. However, normally users have one ts file per language and want a 1:1 mapping. So we need to make this configurable as not to force people to create one product per ts file. Change-Id: I1b14eca6b52fd18a792e1ba26e3fe55db371ae3b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Remove deprecated properties.Christian Kandeler2015-08-312-2/+0
| | | | | | | | | | Change-Id: I961bdece8fc284dd102ce443646e06cdd54660d6 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* | Fix blackbox findFiles on Windows.Jake Petroules2015-08-261-0/+1
| | | | | | | | | | Change-Id: Iaa5058073530394241c9f109a3ffb5dd15509930 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Have one instance of qbs settings per qbs version.Christian Kandeler2015-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | So that one can switch between versions without having to regenerate profiles every time due to possible incompatibilities. Note: We do not try to magically make old settings work with new versions; if incompatible changes have happened, users still need to re- run tools like setup-toolchains or setup-qt once. Task-number: QBS-527 Change-Id: If8d0015e849ad573a0ed79f624bcd60731244e03 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge 1.4 into master.Christian Kandeler2015-08-071-0/+1
|\| | | | | | | Change-Id: I8d544954f97e53e82fe1385e1a4dd87c286be359
| * Make it possible to overwrite properties conditionally.Joerg Bornemann2015-08-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | If a product or higher-level module wants to set the property of a (different) module only if some condition is fulfilled and leave it unchanged otherwise, it would currently need to duplicate the value from the module prototype. Obviously, this is not feasible for anything but the most trivial definitions, and even then it easily introduces maintenance problems. Change-Id: If33c93a25dc84603fe95704e8815aa6e3aa1e0e4 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Use BlackboxOutputArtifactTracker for qdoc.Jake Petroules2015-08-054-18/+90
|/ | | | | Change-Id: Ie5b2eb70cd371287820dcc180ff3e21682ae062f Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 15:56:30 +0000