aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/qtprofilesetup/templates
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Merge remote-tracking branch 'origin/1.5'Joerg Bornemann2016-06-083-3/+3
|\ | | | | | | | | | | | | | | 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-063-3/+3
| | | | | | | | | | | | Change-Id: I885d94bb14b325dc36767a840ebdb0be1fb59dd2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> 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-033-1/+133
|\| | | | | | | | | | | | | | | Conflicts: src/lib/corelib/jsextensions/environmentextension.cpp src/lib/corelib/language/scriptengine.h Change-Id: I77e4626218612656d0963d1bfc643d9f9e7f4edd
| * 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-272-0/+116
| | | | | | | | | | | | | | | | 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>
* 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>
* 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-311-1/+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>
* 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-052-18/+87
|/ | | | | Change-Id: Ie5b2eb70cd371287820dcc180ff3e21682ae062f Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Take cpp.systemIncludePaths into account when running moc.Christian Kandeler2015-07-021-0/+2
| | | | | | Change-Id: I36f4500dabfd8e8502a87b39d0428c37b3527a6a Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* update license headersJoerg Bornemann2015-03-021-2/+2
| | | | | Change-Id: I36d825db3a5ef32c162c3063aab1e8a1f2696f4f Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Filter standard output from qhelpgenerator.Jake Petroules2015-02-231-0/+3
| | | | | Change-Id: I5495be0bc57592eb9e377fb00ea168c60db9921f Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Merge branch '1.3' into 'master'Christian Kandeler2015-01-281-6/+6
|\ | | | | | | | | | | | | | | | | Conflicts: doc/reference/jsextensions/jsextensions-general.qdoc src/lib/corelib/language/evaluatorscriptclass.cpp src/lib/corelib/language/evaluatorscriptclass.h Change-Id: Ic9b77b56e8fc8bf93e0a553930757de8c93fed22
| * Update LicenseEike Ziller2015-01-261-6/+6
| | | | | | | | | | Change-Id: I092fca9f950de1ba38826c33b155f86feae2770b Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | support Q_OBJECTs in objective C++ filesJoerg Bornemann2014-11-111-1/+1
| | | | | | | | | | | | Task-number: QBS-616 Change-Id: I16a6e2f17bb7b9522bc0e2f75d491bdf3b3647b6 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Merge remote-tracking branch 'origin/1.3'Joerg Bornemann2014-11-031-3/+0
|\| | | | | | | | | | | | | Conflicts: tests/auto/api/tst_api.h Change-Id: I1f9cb9105f4ed2c428729810b7a7079d11e90957
| * libqtprofilesetup: Remove unused property from template.Christian Kandeler2014-10-281-3/+0
| | | | | | | | | | Change-Id: I242ed5b08c47899e3985be160df105a26b3d3df7 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/1.3'Joerg Bornemann2014-10-271-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/lib/corelib/tools/version.h tests/auto/api/testdata/disable-product/project.qbs tests/auto/api/testdata/disabled-product/disabledProduct.qbs tests/auto/api/testdata/disabled-product/main.cpp tests/auto/blackbox/tst_blackbox.cpp tests/auto/blackbox/tst_blackbox.h Change-Id: Ic45aa1b70946fd3e037ecce56f1cd7c414ca832c
| * set up entry point libs in Qt.coreJoerg Bornemann2014-10-271-2/+4
| | | | | | | | | | | | | | | | Let the Qt profile setup write the entry point libs to Qt's core.qbs. Also, add shell32.lib to MSVC if we have a Qt >= 5.4. Change-Id: I8ade1141101ac7494031ad49e78ba63be0342f03 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Merge remote-tracking branch 'origin/1.3'Joerg Bornemann2014-10-161-7/+8
|\| | | | | | | | | | | | | | | Conflicts: qbs_version.pri version.js Change-Id: I645b2f37bae9d36d4bca54b267d57df8b0b7fd21
| * License update.Eike Ziller2014-10-161-7/+8
| | | | | | | | | | | | | | Add LGPLv3 option. Change-Id: I8a63ad5e46a2701032b2103f791df4dec5b707e8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge remote-tracking branch 'origin/1.3'Joerg Bornemann2014-10-102-15/+36
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qbs/modules/cpp/GenericGCC.qbs src/app/qbs-setup-toolchains/probe.cpp src/lib/corelib/buildgraph/buildgraph.cpp src/lib/corelib/language/language.cpp src/lib/corelib/language/language.h tests/auto/api/tst_api.cpp tests/auto/blackbox/tst_blackbox.cpp tests/auto/blackbox/tst_blackbox.h Change-Id: Ie337cd6b55ec1de4f906cb8311959eeb7bc6d686
| * Utilize ModUtils.PropertyValidator in Qt.core module.Jake Petroules2014-10-081-11/+13
| | | | | | | | | | Change-Id: I3631ec337d3657d4e69a2bd02f3c5b63f8ad4b2a Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| * Make Qt build variants logic more sensible.v1.3.2Christian Kandeler2014-10-072-15/+34
| | | | | | | | | | | | | | | | | | | | We no longer force the Qt build variant to match the build variant of the application linking against it (except for MSVC, where that is required). Change-Id: Ie2c80fbb0d688cdcbab57ad638aaccbbd6988a22 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge branch '1.3' into master.Christian Kandeler2014-09-111-5/+12
|\| | | | | | | | | | | | | | | | | | | Conflicts: qbs_version.pri src/app/qbs/commandlinefrontend.cpp src/lib/corelib/language/projectresolver.cpp version.js Change-Id: I6b8a09faed7970821955ac329b0c244ddffb037c
| * Fix run environment setup.Jake Petroules2014-08-281-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now Darwin platforms get the same DYLD_* environment variables set as Xcode (plus Qt) so applications can be developed/tested without embedding bundles. This brings equivalent behavior to what already exists on Windows. This also fixes a regression introduced in 5877328c4dacb1283408083cb3538ea5bc46eae5 with the Node.js module, causing the working directory to be inappropriately changed by the run command. Change-Id: Ic2904f105378eb61d9236367329a2f9c8771a7d3 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Merge remote-tracking branch 'origin/1.3'Joerg Bornemann2014-08-215-4/+18
|\| | | | | | | Change-Id: I1a98b360957e0c8caa6b97bc32e6bc51745f1a10
| * Link Qt libraries as full file paths.Christian Kandeler2014-08-205-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That is, give the full file path to the linker instead of using the -L/-l combination that can pull in the wrong version of a library if one is installed e.g. in /usr/lib. For this purpose, the patch does two things: 1) In each Qt module file, add the file path of the respective library to cpp.{static,dynamic}Libraries instead of the base name. 2) When reading Qt's prl files, check in all occurrences of "-l<lib name>" whether <lib name> matches a Qt library and if so, replace <lib name> with the full file path to the library. Change-Id: Ic02633ae7f820bd2365f8e510f7c16f73d93e584 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Fix handling of cpp.cxxStandardLibrary.Jake Petroules2014-08-191-9/+6
|/ | | | | | | | | | This fixes a bug where -stdlib=libc++ would be added unconditionally, and makes sure not to add -stdlib=undefined to the CLI invocation. Also, the Qt.core template has been adapted to use the new property. Change-Id: I1dd12097edd992d851c52287e86572d6ef21bfac Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* qtprofile,clang: add libc++ on iOS and OSX for compilation and linkingFawzi Mohamed2014-07-241-2/+9
| | | | | Change-Id: I8e1964238231ecf87ab5df8b036b79a6c7348a61 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* fix deprecation warning in Qt.gui moduleJoerg Bornemann2014-07-171-1/+1
| | | | | Change-Id: Ie3f4296e6006f37b74644018f399c7694171fa74 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* remove unused property qtModulePrefix from Qt modulesJoerg Bornemann2014-07-172-2/+0
| | | | | | | | This was used to calculate include and library names. That's done in setup-qt now. Change-Id: Ief2b17e9fdf65e829dc563dac49e70d8dcbaebee Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* remove property includeDirName from QtModule.qbsJoerg Bornemann2014-07-171-1/+0
| | | | | | | The usage of this property was removed in 04e5834e. Change-Id: Ib938d9761f432b5b3cfad27d6c4008061edb69c7 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* deprecate Artifact.fileName in favor of Artifact.filePathJoerg Bornemann2014-07-162-6/+6
| | | | | | | | This property is actually a file path, not a mere name. Task-number: QBS-579 Change-Id: I04e8f03eac97b5f86fe743a4923888a3d2a82c5d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove outdated commentJoerg Bornemann2014-07-161-1/+0
| | | | | | | We don't support that much control over the build dir's contents. Change-Id: I50cd5e254551e109925b0265a52319df326142f2 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* libqtprofilesetup: Gather information about Qt plugins.Christian Kandeler2014-07-114-0/+56
| | | | | | | | And create modules for them. These also handle the creation of the "import" source file when building against a static Qt. Change-Id: I883a1dd96c5e38c9d4bb5c13af807b1bf388f8b1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* ios: correctly renames mainFawzi Mohamed2014-07-101-1/+1
| | | | | | | | | we still use the #define for this, which might change also unrelated uses of main. We might want to use a pre link step to rename the mangled symbol as done by mkspecs/macx-ios-clang/rename_main.sh Change-Id: Ib013a506109ad472bdc202c9470767493ad5cdcb Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* libqtprofilesetup: Set up ios-specific flags at setup time.Christian Kandeler2014-07-082-35/+1
| | | | | | | | This enables us to get rid of qtfunctions.js. Change-Id: I4cf593742f7afcfb9caa8e2984b11b80d4fb6265 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* libqtprofilesetup: Fix usage of undefined variable.Christian Kandeler2014-07-071-2/+2
| | | | | | | Undetected so far, as it hits only in a very specific code flow. Change-Id: Icdb63e3a07ec0114756bf2869395f27db565e174 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 10:23:12 +0000