summaryrefslogtreecommitdiffstats
path: root/qtbase.pro
Commit message (Collapse)AuthorAgeFilesLines
* de-duplicate QT_DISABLED_FEATURES after resolving dependenciesOswald Buddenhagen2013-11-041-1/+2
| | | | | | Change-Id: I1873c1e7c59af02b06566d0e47c020c609d49c9f Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* export QT_NO_<foo> equivalents to the build systemOswald Buddenhagen2013-10-311-0/+19
| | | | | | | | | | | | | | | | | | | | | this makes it possible to properly exclude entire subprojects based on the availability of features, rather than stuffing every single source file with #ifdefs. the defines are aggregated from the -qconfig <profile>, -no-feature-<foo> and some other configure flags. usage: load(qfeatures) !contains(QT_DISABLED_FEATURES, textarea): SUBDIRS += textstuff Task-number: QTBUG-28102 Change-Id: I83400632d64312fa4b907e1318dddfe27c432387 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Peter Hartmann <phartmann@blackberry.com> Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
* validate qconfig-*.h against qfeatures.txtOswald Buddenhagen2013-10-291-0/+11
| | | | | Change-Id: I59b7e30cfaa2b1bf2c5d4a3e04b5169f3c9439b5 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* don't emit comments to generated qfeatures.hOswald Buddenhagen2013-10-291-7/+2
| | | | | | | | | | | | | | | | the file is not meant to be human-readable and even less editable, so there is no point in having comments in it. also, it was completely inconsistent to start with: features without dependencies were listed as "templates" in form of commented out #defines to disable them manually, while features with dependencies had a respective #ifdef block to be automatically disabled, but no "template" to disable them manually. now only the #ifdef blocks remain. the actual configuration is done by configure via qconfig.h. Change-Id: I8b9e56ba570908dad4cc6dfcd24bf0e1da8b290f Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* generate qfeatures.h at build timeOswald Buddenhagen2013-10-291-0/+47
| | | | | | | | | much more elegant than the checked in file. and less chance to get it wrong, as people often enough do. Change-Id: I975a62dfd83ce4f15947ce54f3c40931b1badae0 Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-271-2/+2
|\ | | | | | | | | | | | | | | Conflicts: configure mkspecs/features/create_cmake.prf Change-Id: I94aea83b83833395d5db399209e0e51b92ef23b5
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-201-2/+2
| |\ | | | | | | | | | Change-Id: I94bb158562ae6b80a87b40139d7302ea7b9b9aa8
| | * assemble the tool commands at use time, after allOswald Buddenhagen2013-06-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the precise syntax depends on what exactly the command is used for, so we need to resolve it at the last moment. see followup commits. This logically reverts commits 6f4ff81380862ad0e788151b35d742f548241d5a and 731e6bece5cebe205ca47c1c078c7ac18984ba1c. Change-Id: If285c91d7521069be86d32593b5c2ae2027b3038 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-201-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp tools/configure/configureapp.cpp Change-Id: I3092bd3276af14304b7ab3ae1e1cc05d11cdede0
| * | move qmake docs into qtbaseOswald Buddenhagen2013-06-171-0/+2
| |/ | | | | | | | | | | | | | | as of qttools/18a5e89623815f5355b4173a2e93609eb10289d1 Change-Id: I75cb55e0c404449a4e0d963e09185287a3f6343e Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* / don't copy mkspecs to build directoryOswald Buddenhagen2013-06-121-1/+1
|/ | | | | | | instead, teach qmake to use the mkspecs dir from the source dir as well. Change-Id: I9edac11f8997fcb0594d0a67419d4733dd4ed86b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* always create qt_tool_syncqt.pri when shadow-buildingOswald Buddenhagen2013-05-151-1/+1
| | | | | | | | | | | | | | the fallback is to look in the install dir (which is the build dir when no -prefix is used), which doesn't work for a script in the source dir. amends 6b38524b Task-number: QTBUG-31131 Change-Id: If615ab4e3a2839b6b5be9bf6ef79d3f894b1748d Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* get rid of syncqt wrapper scriptsOswald Buddenhagen2013-05-131-5/+2
| | | | | | | | | | | instead, rename it to syncqt.pl and rely on qtPrepareTool()'s new ability to correctly invoke it as a perl script even under windows. the wrappers themselves have been trivial at this point, so there is no added value in keeping them, either. Change-Id: I77cf65edbcfaa48ed1900defe940d4eb4b82d5b9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* create tool pri file for syncqtOswald Buddenhagen2013-02-111-0/+23
| | | | | | | | | | so that *really* all non-installed tools are properly registered. if some day we have more build scripts, this code should be centralized in a .prf file. Change-Id: I5b292a4b30199cb59838319f2dc9f88cd54bb57d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* rewrite default spec handlingOswald Buddenhagen2012-11-011-10/+0
| | | | | | | | | | instead of symlinking (on unix) or creating a forwarding spec (on windows), just put the default specs into (the bootstrapped) QLibraryInfo. Change-Id: I595500ef7399f77cb8ec117c4303bc0a2ffe505f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Modularize documenation buildTor Arne Vestbø2012-10-101-0/+4
| | | | | | | | | | qdocconf files can now reference $QT_INSTALL_DOCS to pick up e.g. global includes, instead of using relative paths. Qt modules will automatically get a doc target that builds and installs into the right place (including supporting shadow-builds) if they set QMAKE_DOCS before loading(qt_module). Change-Id: Ia408385199e56e3ead0afa45645a059d1a8b0d48 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Use slogger2 for logging on Blackberry instead of writing to stderrFabian Bumberger2012-10-041-0/+1
| | | | | | | Change-Id: Id0137400f18c8dfe7be7ca44670c16615401d424 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Peter Hartmann <phartmann@rim.com>
* Install right version of tools when x-compiling.Rafael Roquetto2012-07-171-2/+2
| | | | | | | | When cross-compiling from a Windows host, we need to install the right (win32) versions of syncqt and qmake into the target folder. Change-Id: I35fc4b05bb6ad7605bc932cae527372a9fe0ba3e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* remove support for syncqt-based config testsOswald Buddenhagen2012-07-121-5/+0
| | | | | | | now that all modules have migrated, dispose of the clutter. Change-Id: Ib8937c1452536f645b76c0097b927df1108afc1a Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix installation of syncqt.Casper van Donderen2012-07-091-2/+2
| | | | | | | | - Use the syncqt from the source dir, not build dir. - Copy both syncqt and syncqt.bat on win32. Change-Id: Ic07805d03124386fb112c154e22363a06ae1c8ec Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* windows hosts of course also need exclusion from mkspecs_preOswald Buddenhagen2012-07-061-2/+2
| | | | | Change-Id: I90de625b1b521977a4dc1cd499eb6ece02d837f9 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* centralize handling of QT_BUILD_PARTSOswald Buddenhagen2012-07-051-30/+1
| | | | | | Change-Id: I33b8c3958a102d87461ad887fa5749bd9a6dc037 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* remove special handling of the default{,-host} specsOswald Buddenhagen2012-07-031-11/+11
| | | | | | | cp is perfectly capable of properly copying the symlinks Change-Id: Ia45a4521af2ffb70af4e111480c0d6b7999c96c1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Restore building of examples, tests.Rohan McGovern2012-06-221-2/+2
| | | | | | | | | | Without this, a simple "configure && make" will not build the examples or tests, even if the "-make tests -make examples" options were used. This is a partial revert of 709cc8800e7d8600e181cf6b9f8b1033faefe596. Change-Id: If363cd24d30ba4c102a35ed2617999ae4e9ed9b0 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* detach src/src.pro and src/tools/tools.pro from qtbase.proOswald Buddenhagen2012-06-191-1/+1
| | | | | | | | | they were included instead of being proper subdirs. this doesn't appear to be necessary for anything at this point. Change-Id: Ie57285df8e5ea7bd8883bcd42fa6ed62b8e1d54d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* make makefile generation under unix saneOswald Buddenhagen2012-06-191-2/+2
| | | | | | | | | | we now simply call qmake -r, which is also what we do under windows. -fast mode is retained for examples and tests, though with moderately modified semantics (i couldn't be bothered to decipher what the old ones were supposed to be). Change-Id: Id2c2d2bed9c8d52ac42f31b388bffc34f4649650 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* introduce ability to build projects for the host systemOswald Buddenhagen2012-06-191-8/+10
| | | | | | | | | | | | | | | | | when qmake runs into the new option(host_build) command, it will restart the project evaluation with a host spec. the new default host spec is called default-host (gasp!). it is overridden with the pre-exising -spec / -platform option, while the new -xspec / -xplatform option overrides the pre-existing default spec. specifying -spec but not -xspec will set the xspec, too, so the behavior is backwards-compatible. same for the XQMAKESPEC override read from .qmake.cache and the environment variable. the cleaner solution would be adding -hostspec, to be symmetrical with the override semantics, but that would deviate from configure in turn. Change-Id: I4297c873780af16ab7928421b434ce0f1d3820da Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Remove all references to X11 session managementDonald Carr2012-06-011-1/+0
| | | | | | | | | There is no session management currently implemented for the xcb QPA backend. Update the build system to reflect this. Change-Id: I3486de5741f1fb7e09330ca142b8235a84d3b91d Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* device: Add -device and -device-option to configureGirish Ramakrishnan2012-03-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | For some reference platforms and SDKs we will need to pass in extra paths. Currently users have to modify the mkspec to adjust paths or set environment variables that will be picked up. This change introduces the -device <name> and -device-option <key=value> option. The key value pairs will be written to a qdevice.pri and can be used by the qmake.conf of the device spec. The reason to not save the key value pairs in qconfig.pri is becase of the fact that the device spec loads the qdevice.pri earlier than the qconfig.pri. qdevice.pri allows the mkspec to set the compiler flags and qconfig.pri allows configure to add to those compiler flags. Done-with: Holger Freyther Change-Id: I931a197b8be72397e1eedfee09502eefc01c9d4f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com> Reviewed-by: Donald Carr <donald.carr@nokia.com>
* remove obviously counterproductive uses of QT_SOURCE_TREE & QT_BUILD_TREEOswald Buddenhagen2012-03-081-10/+10
| | | | | Change-Id: I77cf734b58f350d82277c084a680ab56fdf82f08 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Remove references to missing testsGirish Ramakrishnan2012-03-071-4/+0
| | | | | | | | | | 17ddce4692b31af4374b28cd40b9f25e8ed629cd removed the endian test. 90a5492fb01ec3bc10c18c5a0acd38d6ed845a6d removed the ipv6 test. largefile and nix are long dead. Change-Id: If8e5d4f0546e30778b82ee99f662cb9ed3aefacb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* revamp -sysroot and -hostprefix handlingOswald Buddenhagen2012-03-011-4/+4
| | | | | | | | | | | | | | | | | 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>
* Add configure, sync.profile, and header.* to OTHER_FILES in qtbase.proBradley T. Hughes2012-02-081-0/+8
| | | | | | | This makes these files easily locatable when using Qt Creator. Change-Id: Ie0c15ebf2cc7045954713265bf524f2ecf1eea34 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Remove Symbian specific code from qtbase.Xizhi Zhu2012-01-311-28/+2
| | | | | Change-Id: I27d37d914b71e1e43c94e2a975ffec49e1ecd456 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove support for the MNG file format and the bundled libmngaavit2012-01-251-1/+0
| | | | | | | | | | | | | The MNG file format is generally abandoned, and libmng has been unmaintained for several years. The MNG plugin and bundled libmng has been moved to the qtimageformats project on Gerrit. Task-number: QTBUG-21869 Change-Id: I946432347014ffde2b72307a5f8b166ca5553602 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Ensure qmodule.pri is installed.Rohan McGovern2011-11-231-1/+5
| | | | | | | | | | | | | | | | From the commit message of 0b2ce8520020a0db9b5b5feb5e72f64518d3eea5 and the code in qt_module.prf, it is apparently intended that qmodule.pri is installed, but this was never implemented correctly. Make sure we install it. This has gone unnoticed because it happens to be installed by accident unless $$QT_SOURCE_TREE != $$QT_BUILD_TREE and $$QT_BUILD_TREE != $$[QT_INSTALL_PREFIX] (i.e. a shadow build which is not using -developer-build). Change-Id: Iee861a7bb592ca43a61ad91f1ef6a7a5bd21aff8 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix make confcleanAnders Bakken2011-09-121-4/+4
| | | | | | | | | | | Merge-request: 1227 Reviewed-by: ossi (cherry-picked from commit 792b4b500ab740f89db5586791105ff13778b87f) Change-Id: Id5ec2cfb228691c8483bf1d9e0c6a763aa649217 Reviewed-on: http://codereview.qt-project.org/4570 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Try to make sure the config test script is installed.Michael Goddard2011-07-261-0/+5
| | | | | | | | | | And try to fail a bit more gracefully if it isn't. Change-Id: I62e01c0536aa0a032940d6a9a5ccf5edcfeef221 Reviewed-on: http://codereview.qt.nokia.com/2109 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove all references to demos.Casper van Donderen2011-06-231-4/+0
| | | | | | | | | | | Remove the references to demos from configure and qtbase.pro. This is done because of the merge of the demos and examples in Qt. Everything will be added as an example. Change-Id: Iec040f5c719384c7aabba971316de40195ed3a69 Reviewed-on: http://codereview.qt.nokia.com/619 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fixed ordering problem when configuring with `-make <part>'Rohan McGovern2011-05-261-14/+24
| | | | | | | | | | | | | | | | Prior to this change, running configure with the `-make' option would affect the order in which parts of Qt are built. This is unintuitive and would easily cause build failures. For example, configuring with `./configure -make demos' would attempt to build demos before building libs, which, of course, would fail. Refactor the code so that the result is the same regardless of the order of `-make' options. Change-Id: Idfa61834a0f01d0628a9a1ae27ece94ae3647e6d Reviewed-on: http://codereview.qt.nokia.com/128 Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix -nomake tests.Lincoln Ramsay2011-05-251-4/+2
| | | | | | | It now means "don't run qmake", not just "don't build". This is consistent with -nomake demos and -nomake examples Reviewed-by: Rohan Mcgovern
* tests: enable compilation of autotests for qtbase by defaultRohan McGovern2011-05-111-4/+7
| | | | | | | | | Tests are now treated like examples and demos: compiled by default, unless you configured with `-nomake tests'. (They are still not installed by default, however.) Reviewed-by: Jason McDonald Change-Id: Ifc56f6763bb2aafe6fe57b684751f99ec82ea26f
* Install syncqt, and ensure it runs fine for external modulesMarius Storm-Olsen2011-05-021-0/+6
|
* Fixed "make check" target for qtbase.axis2011-04-271-0/+6
| | | | It was caused by a missing "tests" target.
* Build examples and demos in qtbaseMarius Storm-Olsen2011-04-271-10/+1
|
* Some changes for qtbaseMarius Storm-Olsen2011-04-271-31/+1
|
* Initial import from the monolithic Qt.Qt by Nokia2011-04-271-0/+172
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