summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/default_pre.prf
Commit message (Collapse)AuthorAgeFilesLines
* remove some unnecessary CONFIG additionsOswald Buddenhagen2012-12-171-1/+1
| | | | | | | | qt is already added by spec_pre.prf, warn_on and depend_includepath by default_pre.prf. Change-Id: Ic00e0ba496d698ed9659c476f2ca99fc0f86a093 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* add some docu about the project loading sequenceOswald Buddenhagen2012-12-131-0/+4
| | | | | Change-Id: Icb6bb58247724aeb6b9433a8d032718f1ba4babe Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Automatically import plugins in all applications with static QtMiikka Heikkinen2012-12-111-1/+4
| | | | | | | | | | | | | | Since all gui applications already need some QPA plugin added, we might as well add the default plugin and generate the code to import the plugins automatically. User can opt out from the automation by removing relevant items from CONFIG variable: link_qpa_plugin or import_plugins. Task-number: QTBUG-28131 Change-Id: Ic171c363464c099143374d3e39bcc28f6edf73d2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* re-enable "check" targets for all projects, but with opt-out possibilityOswald Buddenhagen2012-12-111-1/+1
| | | | | | | | | | | the feature was backported to qt 4.8, and people apparently started to rely on it. it doesn't add too much overhead when not used, so enable it by default again. Change-Id: I15890027603ede733347f2c05b36ad1389c649cf Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* centralize doc target related codeOswald Buddenhagen2012-12-021-5/+0
| | | | | | | Change-Id: I710a7f2fc3422ec8ba5b8e90bfd92e7931092ad0 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* move QMAKEMODULES addition to .qmake.super to qt_build_config.prfOswald Buddenhagen2012-10-261-14/+0
| | | | | | | | | | | | this is qt module specific magic that has no business in the generic default_pre.prf. a side effect is that every qt module now needs to have a .qmake.conf (unless it sets MODULE_QMAKE_OUTDIR, like webkit does). Change-Id: Id9e5f6eee2d8ec0c711e7217d9e1893fc9c88132 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* move syncqt call to qt_module_headers.prfOswald Buddenhagen2012-09-211-15/+0
| | | | | | | | | | | | | for one, the syncqt invocation is qt module magic and thus simply does not belong into the generic default_pre file. second, this way the forwarding header generation is now linked to the rest of the build magic for a particular module, which is way less confusing for the unsuspecting developer. Change-Id: Idc8e420d3faf173d7fff4a41e6e1c59af15c3023 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* move syncqt -check-includes handling to default_pre.prfOswald Buddenhagen2012-09-111-0/+2
| | | | | | | | this is where the syncqt calls for all modules happen Change-Id: I544e5fa6950c2babe56d78f5543d2c3262016687 Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* enable depend_includepath by defaultOswald Buddenhagen2012-09-081-1/+1
| | | | | | | | | | | | DEPENDPATH is hard to get right, and consequently most projects have broken dependencies. the easy way out is just adding everying in INCLUDEPATH to DEPENDPATH, like we do ourselves in qt. if somebody wants to optimize, he can opt-out. Change-Id: I7fb56010728fd2b0d2b7d4d26386f366d414ba04 Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* put the include/ of all modules into qtbase when doing non-prefix buildOswald Buddenhagen2012-07-181-0/+3
| | | | | | | | | all other build artifacts go into qtbase's build directory anyway. this asymmetry was confusing and causes cmake users some grief. Change-Id: I4d7f7b2318f6c5300eb00360664785cb2c8217b7 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove support for forwarding module pri creation via syncqtOswald Buddenhagen2012-07-161-15/+11
| | | | | | | | | now that all modules have migrated, this dead code can be removed. Change-Id: I5e9c7dd3fb271346d1b5f0e2930874da3e4d2d57 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* remove support for syncqt-based config testsOswald Buddenhagen2012-07-121-3/+0
| | | | | | | now that all modules have migrated, dispose of the clutter. Change-Id: Ib8937c1452536f645b76c0097b927df1108afc1a Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* let default_pre add modules to the qmake pathOswald Buddenhagen2012-06-191-1/+3
| | | | | | | | | | | | | | that way qmake is made aware of the forwarding pris which are generated for this module even when a top-level .qmake.cache prevents the module's root from being found automatically. the path is also added to the cache, so that subsequent partial qmake-ing of the tree will still find the module. this also makes the -cache-module-fwd parameter of syncqt useless, so remove it. Change-Id: I2afbc52a465c0b3260e9bcaf032c43a82ae8061f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* do not route qtmodule-configtests invocation through syncqtOswald Buddenhagen2012-06-191-1/+4
| | | | | | | there is completely no reason to do it. Change-Id: Ie186ef4c1bbd12c256acb2fe374d12ebe777d6c9 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* make qmake module path configurable separatelyOswald Buddenhagen2012-06-191-1/+4
| | | | | | | this is needed by webkit's creative directory layout. Change-Id: I2317162c11696d2820423d63563b10d3024a6cb6 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* write forwarding pris to $outpath/mkspecs/modulesOswald Buddenhagen2012-06-191-1/+1
| | | | | | | | | | this makes qmake find them automatically now. consequently, also do not write QMAKE_EXTRA_MODULE_FORWARDS to .qmake.cache. still write the cache file, though, as otherwise a top-level cache would mess up the module root detection. Change-Id: I998b94fcc73ca3f8bf1af09a394ff8d40cf1fb76 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove useless variable assignmentOswald Buddenhagen2012-06-191-3/+0
| | | | | Change-Id: I3552305473cd0150d83c1e2a3c9fb0c4097244cc Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* rename QMAKE_SYNCQT_OUTDIR => MODULE_BASE_OUTDIROswald Buddenhagen2012-06-191-2/+2
| | | | | | | | | | | a variable name should not reflect the tool which uses it, but its purpose - especially, as the scope will be extended soon. this variable is used by webkit, which has a somewhat creative directory layout. Change-Id: Id3d3fad6ed9395cb967aeabc79e47a0ba17f5423 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* simplify code which determines how/where to create forwarding prisOswald Buddenhagen2012-06-191-29/+6
| | | | | | | | the qtbase install dir being a build dir is a necessary and sufficient condition for detecting a developer build. Change-Id: I3d98c789ac6fbe570980459edabb9a941bf1e5d6 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* move $QTDIR handling out of syncqtOswald Buddenhagen2012-06-191-2/+2
| | | | | | | | | instead, always pass -qtdir (which, btw, is a slight misnomer - it should be -qtdatadir) with the correct path. this centralizes the relevant logic in default_pre.prf. Change-Id: Icc788d3f3e5f7b68b444e63e181efdea3b4ef160 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* move moc, rcc and uic CONFIG additions to the respective qt modulesOswald Buddenhagen2012-06-191-2/+1
| | | | | | | they don't belong into the global scope Change-Id: I27a3de5f706392b3c4a84035521bc3b4e4055740 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Revert "make default_pro.prf advertize dynamically created .qmake.cache"Oswald Buddenhagen2012-06-191-3/+0
| | | | | | | | ... and followup fixes. this is not needed any more due to the breaking patch being reverted. Change-Id: Ia3416fcc16ddece680efbd0322286a601879fa0a Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* turn off exceptions by default where they aren't requiredLars Knoll2012-05-171-1/+1
| | | | | | | | | | | | | 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>
* Set QMAKE_DOCS_INSTALLDIR to $$[QT_INSTALL_DOCS] to allow overriding in .proMarius Storm-Olsen2012-05-151-0/+5
| | | | | | | | | | | | Normally you want to pass -installdir $$[QT_INSTALL_DOCS] to qdoc by default. However, if you want to force the generation of URL links to the documentation, the option cannot be specified. By setting the QMAKE_DOCS_INSTALLDIR variable in default_pre.prf a project may override it at will, as for example Qt Creator would do. Change-Id: Ib31f03acf4e8050cf2dd3aa33f3a10ed027f1df7 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* another attempt at solving the popping up of .qmake.cache problemOswald Buddenhagen2012-03-091-1/+1
| | | | | | | | | syncqt may generate that file also as a result of configure tests. so just check for the file's existence instead of trying to reproduce under which circumstances it should appear. Change-Id: Ia24f96b05fc70e104f7be19d08cea614ffb505be Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Merge remote-tracking branch 'origin/api_changes'Lars Knoll2012-03-041-2/+2
|\ | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-5.0.0 mkspecs/features/qt_module_config.prf qmake/project.cpp qmake/property.cpp Change-Id: I6e4af40743a9aeff8ed18533a48036e332acc296
| * revamp -sysroot and -hostprefix handlingOswald Buddenhagen2012-03-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | don't announce a dynamic .qmake.cache if we don't actually create oneOswald Buddenhagen2012-03-021-3/+4
| | | | | | | | | | | | | | otherwise we are breaking the "less hacky" configurations. whoops. Change-Id: Ibb037753fbaf30beae3d30173be77d48b978b60b Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* | make default_pro.prf advertize dynamically created .qmake.cacheOswald Buddenhagen2012-03-011-0/+3
|/ | | | | | | | | | | | | moving the detection of .qmake.cache to the qmake startup had the side effect that a suddenly popping up cache would not be picked up by nested projects any more. this is not supposed to work in the first place, but the syncqt hack for building against non-installed modules relies on it. until we have cleaned that up properly, we need a way to notify qmake about the appearance of the cache file. Change-Id: I450646b936e3bb2ef2ed3aba05df58e521ccdc61 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* mkspecs: Case-insensitive check of paths on Windows.Friedemann Kleint2011-11-181-3/+10
| | | | | Change-Id: I2b46bce79774ed9e5b5f6d73cc6e62ae50e35a5e Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Allow overriding the output dir when running syncqtTor Arne Vestbø2011-11-161-1/+2
| | | | | | | | | | | | | | | | This feature is only available to advanced qmake clients who have their own defaults_pre.prf, where QMAKE_SYNCQT_OUTDIR is set before loading Qt's own default_pre. This is useful to be able to put the sync.profile file in a different level in the source tree than where you want the output in the build tree. An alternate/complimenting solution would be to allow the output path to be overriden from within the sync.profile file. Change-Id: I3cdef82dbe492877507e269e18571456beeb2b7d Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Add rudimentary config.test support when configuring modules.Michael Goddard2011-07-221-1/+1
| | | | | | | | | | | | | | | | | | An extra script is added (qtmodule-configtests) which is currently invoked from syncqt (with some derived parameters passed to it). The module can optionally have an entry in the module's sync.profile file in the form of a perl map of "test name" => parameters. Tests can print an advisory message if they fail (e.g. "Install this SDK/dev package"), or abort the syncqt process (e.g. mandatory prereq missing). Also, if the test has a "requires(foo)" line that results in it being skipped, this is also supported. Change-Id: Ic3c820a488a0992c944994d4d7dc283da36742d6 Reviewed-on: http://codereview.qt.nokia.com/928 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Make sure we only run syncqt for the non-buildpass casesMarius Storm-Olsen2011-07-211-1/+1
| | | | | | | | | | | | | | | In debug_and_release builds, we have three passes, the glue pass, and a pass for each build type. We only need to run syncqt when we are in a glue pass, which is when 'build_pass' is not set. In non-debug_and_release builds, build_pass is never set, so this condition works for all build types, with multiple configurations or not. Change-Id: I191da0df3ad422bb5fb8994391c2b2d2e23efc32 Reviewed-on: http://codereview.qt.nokia.com/1717 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Ensure we pass -developer-build to syncqt for -nokia-developer buildsMarius Storm-Olsen2011-06-111-5/+13
| | | | | | | | | | | | | | When the build directory is the install directory, separate modules should use qtbase as the path for libs, module pris etc. This fixes the logic in default_pre.prf so that syncqt is called correctly in these cases. Change-Id: Ib3798bfd145d3a3e43b9a222af46270245e6c2e6 Reviewed-on: http://codereview.qt.nokia.com/464 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Reviewed-by: Eckhart Koppen <eckhart.koppen@nokia.com>
* Make qmake slightly more verbose with its syncqt output.axis2011-06-061-3/+5
| | | | | | | | | | It can be hidden with -silent, however. Change-Id: I6dbd3c743779b8d2070e41f007df26b530987429 Reviewed-on: http://codereview.qt.nokia.com/235 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Liang Qi <liang.qi@nokia.com>
* Implemented module-local caching of module profiles.axis2011-06-031-2/+6
| | | | | | | | | | | | | | | | | | | | | | | We use syncqt to generate .qmake.cache also for submodules, which contains the location of forwarding module profiles for that module. This enables us to build without having to put module profiles into mkspecs/modules until install time. Also added support for -developer-build to syncqt. What it does is to point build directories for binaries and libraries to a common location in QtBase. This is more convenient when doing development, since you don't need to set your path to every module's bin/ directory, but it cannot be used with release builds, since they need to build independently of QtBase, in their own directory. Change-Id: I959c62c11c644f2147a98da894a72452d9c44327 Task: QTBUG-19585 Task: QTBUG-19583 Reviewed-on: http://codereview.qt.nokia.com/232 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Don't base QTDIR detection on .qmake.cache.axis2011-06-031-7/+0
| | | | | | | | Change-Id: I4adc26c1c070d26277551d302f4638b819ddc311 Task: QTBUG-19585 Reviewed-on: http://codereview.qt.nokia.com/231 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Do not continue if syncqt fails.Lincoln Ramsay2011-05-251-1/+5
| | | | | | | | | | If the user has set QTDIR to something other than the location of the qtbase build directory, syncqt will fail. This change prevents the build from continuing. Ideally, the system should ignore the user-set QTDIR value or give an appropriate error. Reviewed-by: Rohan McGovern
* Made sure syncqt gets called correctly even if it is not in the PATH.axis2011-04-271-1/+2
|
* Have qmake run syncqt automatically, if sync.profile is detectedMarius Storm-Olsen2011-04-271-0/+28
| | | | | | | This will normally only happen for top-level pro files, and syncqt is smart enough to not touch already existing files. And in edition, syncqt uses the original file's timestamp on the fwding files.
* Initial import from the monolithic Qt.Qt by Nokia2011-04-271-0/+3
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 13:35:47 +0000