aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/qtprofilesetup
Commit message (Collapse)AuthorAgeFilesLines
* fix collecting defines in moc.jsJoerg Bornemann2014-04-151-3/+2
| | | | | | | | | | | | We cannot call the moduleProperties function to retrieve cpp.platformDefines and cpp.compilerDefines because it combines all found values of this property. We're only interested in the values that are set in the product's instance of the cpp module. Task-number: QBS-539 Change-Id: I2edbbf44b2cbc3051a0f0abec42d5d385fbb106e Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* pass framework paths to mocJoerg Bornemann2014-04-041-0/+4
| | | | | | | | This is needed to make includes like <QtCore/qsystemdection.h> work in moc. Change-Id: I8295cb833e67f0d2d6a3eba8326b1068eb900dd7 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* avoid duplicate defines in moc callJoerg Bornemann2014-04-041-2/+4
| | | | | Change-Id: If0494d2e2bd1f4bc6deff9491bca1a1e84665b41 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* qtprofilesetup: Fix missing string replacement in output string.Christian Kandeler2014-04-031-1/+1
| | | | | Change-Id: I57dfe4358f52055f30e8fde649f233af550b749d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Make "Qt.declarative" available as "Qt.quick" again for Qt 4.Christian Kandeler2014-03-311-1/+7
| | | | | | | | This was accidentally removed when switching to the new Qt modules approach. Change-Id: Ie8db5a183c2cc3a82d31c2793710983cf4206ef0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix QML debugging for Qt 5.Christian Kandeler2014-03-311-1/+3
| | | | | | | | | | | The line enabling the respective C++ macro got lost when we switched to the new Qt module approach. (And the name of the macro was wrong for Qt 5 anyway, so it hadn't worked before either.) Also add an autotest to catch things like macro renaming in the future. Task-number: QTCREATORBUG-11914 Change-Id: Ica188c20e99c204d1a9d4e5f285a938707d997dd Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Make the "lib" part of plugin and library locations configurable.Christian Kandeler2014-02-271-3/+4
| | | | | | | | Can now be set to e.g. "lib64" if required. Task-number: QBS-343 Change-Id: I6f34ade37f39400cc5fde63133a464565feb34c1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* use filePath instead of fileName where applicableJoerg Bornemann2014-02-253-17/+17
| | | | | | | | This fixes the recently introduced deprecation warnings. Task-number: QBS-258 Change-Id: I10660270895ec89a1444d596922c22e9658ca3ab Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* libqtprofilesetup: Ignore pri file entries with en empty rhs.Christian Kandeler2014-02-211-1/+1
| | | | | | | Otherwise, things like empty include paths can end up in our modules. Change-Id: I8cff8653c4be5beae8f7c6c8c4c87b7ca38ef025 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix exception leak in qtprofilesetup.Christian Kandeler2014-02-201-6/+12
| | | | | | | This is public API and must not throw. Change-Id: I211956ed6667bf3bae1e0049f2eb29516f55ef6a Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Move "static Qt" discovery into libqtprofilesetup.Christian Kandeler2014-02-172-5/+28
| | | | | | | | Otherwise the non-trivial detection code would have to be duplicated in Qt Creator. Change-Id: I7f0c9e1c578ac23c757efad3da8c301a25649677 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* support transformers with an unknown number of outputsJoerg Bornemann2014-02-131-43/+21
| | | | | | | | | | | | | | | | To support different types of nodes in the build graph, we introduce the base class BuildGraphNode. Artifact now derives from BuildGraphNode. A RuleNode class is introduced that represents a rule in the build graph. Rules are applied in the build phase and not in a pre-build phase anymore. The handling of moc has been revisited. The fixed automoc pre-build phase is no more. This is the squashed merge of a feature branch. Task-number: QBS-370 Change-Id: If27cdc51cba8c9542e4282c2caa456faa723aeff Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* make setup-qt templates known to Qt CreatorJoerg Bornemann2014-02-032-1/+4
| | | | | Change-Id: I919fda93b666f32685e5af35252b43e18bfeff86 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Fix handling additionalProductFileTagsMaxim Zaitsev2014-01-291-1/+1
| | | | | | | | | | | | Rules that produce additionalProductFileTags added to the rule graph, but they are not reachable from the product. 'additionalProductFileTags' declared deprecated in product scope, because it's enough to use 'Product.type' property, as it can hold the list of file tags). 'Module.additionalProductFileTags' property renamed to 'additionalProductTypes' as it's more appropriate name. Change-Id: I6e55199162b29dace5bbbad7e2c9eda46f47f424 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* libqtprofilesetup: Fix some module names for Qt 4.Christian Kandeler2014-01-271-2/+2
| | | | | | | The internal name does not have the "qt" prefix. Change-Id: Idccab0f7debefdc6657750528d9ec31dfbe16075 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Make ModUtils a proper import.Christian Kandeler2014-01-215-218/+2
| | | | | | | | So we don't have to duplicate the file for the qtprofilesetup library. We still consider it internal, though. Change-Id: Iea92b141830bc7af821b13c0270372b784f1feb7 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* libqtprofilesetup: Remove profile first.Christian Kandeler2014-01-201-0/+1
| | | | | | | Otherwise we could have outdated properties left. Change-Id: I180ec52d743bd40e8afa03ec4b9baf51a281006a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix more regressions due to new Qt modules approach.Christian Kandeler2014-01-201-13/+79
| | | | | Change-Id: I7e3ebad2730f08371a4036439fcc3b3c3d82be5c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Allow dependencies on "Qt.test".Christian Kandeler2014-01-171-1/+13
| | | | | | | | That's what we called the "testlib" module until recently, so let's keep supporting that name. Change-Id: I324c9b3add0a8709dba8b84458189727df9cf6d2 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add virtual "Qt.widgets" module for Qt 4 installations.Christian Kandeler2014-01-171-0/+8
| | | | | | | | We used to have this when we still hardcoded all the modules, and it got lost during the switch. Change-Id: I3170a2ca77f0a105b1b6c7de485be6d112bf88e7 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Move knowledge about Qt modules into libsetupqt.Christian Kandeler2014-01-1612-1/+945
| | | | | | | | | | | | | | In addition, we make less hard-coded assumptions than before, instead generating almost all modules dynamically from the respective Qt installation when setup-qt is being run. This way, qbs does not have to know about all the modules beforehand, and only the Qt modules that are actually present will have qbs counterparts, making it possible for project file authors to make use of soft dependencies for Qt modules. Task-number: QBS-479 Change-Id: Ie20d2acf249cd159ce4caff2ede4721ab879fad2 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Move Qt profile setup into a dedicated library.Christian Kandeler2014-01-106-0/+337
Otherwise all changes to the implementation will have to be duplicated in IDEs. Change-Id: I61e6d4fa1ee9b724eb5d9de9f233dc915a6c8bc3 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 20:40:37 +0000