summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/qt_module.prf
Commit message (Collapse)AuthorAgeFilesLines
* Move the creation of the MODULE_DEFINES variable above the pri file check.Stephen Kelly2012-08-311-5/+6
| | | | | | | | | The MODULE_DEFINES is also used by create_cmake.prf, whether there is an existing pri file or not. In the case of QtWebKit at least, there is still a handwritten pri file present. Change-Id: I566c32a36aa6b84a455c2785c0da2bae57ea9091 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix CMake file INSTALLS with debug_and_release configurations.Stephen Kelly2012-08-281-1/+1
| | | | | | | Change-Id: Iad0161969e3632862102703fcc239358387e2181 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Peter Kümmel <syntheticpp@gmx.net> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* make .private_includes in module pri files "self-contained"Oswald Buddenhagen2012-08-151-2/+2
| | | | | | | | this puts the whole logic of assembling those paths into qt_module. Change-Id: Iafbe3969e3092e294bdb8243b2dffa7a899a7eb8 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* rename qt_module_config.prf => qt_module.prfOswald Buddenhagen2012-08-081-2/+237
| | | | | | | this is more logical, following the qt_plugin and qt_tool scheme. Change-Id: Ib3b2abec6728cdab260e15128b1cd78e8e6f5d6a Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* fix misnomer: qt_module.prf => qt_build_config.prfOswald Buddenhagen2012-06-191-32/+2
| | | | | | qt_module suggests to be congruent to qt_plugin. Change-Id: I629530bcbe2ba6c0adbdc11a275119c8aff0c953
* fix regexp in qmodule.pri inclusion checkOswald Buddenhagen2012-06-191-2/+0
| | | | | | this also allows us removing the redundant flag variable Change-Id: If26d22280ce7bc2ef3514c7c11ce7cd9baec1293
* make use of $$[FOO/get] propertiesOswald Buddenhagen2012-06-191-13/+1
| | | | | | | | this cleans up a lot of hacks supporting the build of qt, including the last bits of $QTDIR. Change-Id: Id119886ed8097967dad6cf86ebd4e71d90c42841 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Move the sub-architecture feature to better places in qmakeThiago Macieira2012-05-311-0/+13
| | | | | | | | | | | | | | | | | | | Instead of saving the ability of the compiler to produce SSE2, AVX, Neon, etc. code in .qmake.cache (Unix) or qconfig.pri (Windows), move everything to qmodule.pri. Accordingly, move the DEFINES += settings to qt_module.prf instead of qt.prf. This allows us to re-use these settings in other Qt modules (other than qtbase), if necessary. Though currently the extra compiler definitions are found only in src/gui/gui.pro. They can be moved elsewhere when it becomes necessary. As a side-effect of this change, some other flags are moved from .qmake.cache to qmodule.pri (on Unix). The flags that are getting moved should probably be moved anyway. Change-Id: Ibc3ab0111e148d81870772f9357273660aa93417 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* turn off exceptions by default where they aren't requiredLars Knoll2012-05-171-0/+3
| | | | | | | | | | | | | This significantly reduces the size of the generated code in places where we don't need exceptions. The -(no-)exceptions configure flag has been removed in the process, as there is now a fine grained way to control this on a per module level, and Qt is being compiled without exceptions in most places. Change-Id: I99a15c5d03339db1fbffd4987935d0d671cdbc32 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* revamp -sysroot and -hostprefix handlingOswald Buddenhagen2012-03-011-1/+1
| | | | | | | | | | | | | | | | | instead of being a variable added to the makespec (via qconfig.pri), QT_SYSROOT is now a property. the QT_INSTALL_... properties are now automatically prefixed with the sysroot; the raw values are available as QT_RAW_INSTALL_... - this is expected to cause the least migration effort for existing projects. -hostprefix and the new -hostbindir & -hostdatadir now feed the new QT_HOST_... properties. adapted the qmake feature files and the qtbase build system accordingly. Change-Id: Iaa9b65bc10d9fe9c4988d620c70a8ce72177f8d4 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Complain if we don't load(qt_module) firstMarius Storm-Olsen2011-06-081-3/+10
| | | | | | | | | | | | | | | Not having load(qt_module) first in a .pro file which later does a load(qt_module_config) will likely overwrite compiler/linker options in the .pro file. This can be hard to figure out, and wasn't required before when we used a global .qmake.cache for all modules, since it 'preloaded' qmodule.pri file for all .pro files. Change-Id: I8a9aa3247f938be0b3b13f8c8cc96c18a142ba7b Reviewed-on: http://codereview.qt.nokia.com/412 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Properly detect qmodule.priMarius Storm-Olsen2011-04-271-4/+6
|
* Use the 'install_name' linker flag on Mac for the frameworks.Prasanth Ullattil2011-04-271-0/+5
| | | | This is required for the frameworks outside the qtbase module.
* Fixup: not paths for other modulesMarius Storm-Olsen2011-04-271-1/+1
|
* Expose source and build directories for QtBaseMarius Storm-Olsen2011-04-271-0/+16
Also expose moc, uic, rcc, qdbusxml2cpp, include and lib
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 06:45:30 +0000