summaryrefslogtreecommitdiffstats
path: root/qtbase.pro
Commit message (Collapse)AuthorAgeFilesLines
* add configure test result cachingOswald Buddenhagen2016-08-191-0/+1
| | | | | | Started-by: Lars Knoll <lars.knoll@qt.io> Change-Id: I29bafc5913cf95d9908dbcdd9597df2258b69837 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Improve library version handlingLars Knoll2016-08-191-0/+1
| | | | | | | | | | | Output the version as a define into the private config header as a define using a hex number. Like that we can easily do version checks on libraries using the QT_LIBRARY_VERSION(lib) and QT_VERSION_CHECK() macros. Change-Id: I6dc4ac6550886ca95c5542b6e75cd933ed079d76 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* make bootstrapped build work entirely without generated headersOswald Buddenhagen2016-08-191-11/+1
| | | | | | | | | | | | | | instead, the only relevant defines from qconfig.h (QT_VERSION*) are passed on the command line, like we already did for qmake and configure.exe. this enables us to remove the early forwarding header generation from qtbase.pro, and rely wholly on the regular mechanism from syncqt + qt_module_headers.prf. another advantage is that we can be sure that the bootstrapped namespace is not polluted by the target feature configuration. Change-Id: If29285cfc697ae56b591e2ff1a2114686d18fb30 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* make use of silent error() emissionOswald Buddenhagen2016-08-081-5/+5
| | | | | | | | get rid of the entirely superfluous stock "Aborting." messages - the event triggering the exit has already reported the problem. Change-Id: Ib9dfb9e4212f60eceb2ea432cdf56c5a8afe9d65 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Remove the -qconfig command line argumentLars Knoll2016-04-191-2/+2
| | | | | | | | This functionality will get replaced by a new and more flexible system to configure Qt. Change-Id: I04cf694ab1671eeed39b79a660566595a22f54a7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* mkspec: Correctly cleanup qhost.pri file.David Schulz2016-03-221-1/+3
| | | | | Change-Id: Ieb430f5ae681713006987de9f915709e843cebca Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-11-181-0/+5
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qprocess.cpp src/corelib/io/qprocess_unix.cpp src/network/kernel/qnetworkinterface_winrt.cpp tools/configure/configureapp.cpp Change-Id: I47df00a01597d2e63b334b492b3b4221b29f58ea
| * Install fixqt4headers.pl scriptFrederik Gladhorn2015-11-141-0/+5
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-45662 Change-Id: If03b623d4ebcc5cf81b94d2e87ab753a553cff35 Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | configure: Separate host and build platform.David Schulz2015-10-301-10/+1
|/ | | | | | | | | | This separation makes it possible to make a canadian cross build of Qt on a linux build machine. The canadian cross build requires an external Qt that runs on the build system. Change-Id: Ifd83a4c6376d3299647e74bb349a3452a6f433fc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Avoid qtbase/bin/bin artifact when running make installKai Koehne2015-06-031-1/+1
| | | | | | | | Fix regression introduced in commit 63660402d. exists() also returns true for a directory ... Change-Id: I2b4fff00b18eeba53e959306ab33c3bef3795987 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Run license checker in qmakeKai Koehne2015-05-271-0/+5
| | | | | | | | | | | | | | | | | Check for a valid license not only in configure, but also in qmake. To limit the runtime overhead we cache the day of the last run in a .stash file. This allows us to run licheck only for the top-level qmake call, and only once per day. This requires an updated licheck executable that supports the new check mode. [ChangeLog][Tools][qmake] For commercial builds, qmake now checks for a valid Qt license. This requires setting up a Qt Account (or .qt-license file) on the development machine. Change-Id: I2c2a05a4602cc661560568b76ddf520cb8134769 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* fix distclean targetsOswald Buddenhagen2015-04-231-55/+31
| | | | | | | | | | this makes the distclean targets work throughout qt. the dreaded confclean target is aliased to distclean. Task-number: QTBUG-8202 Task-number: QTBUG-20566 Change-Id: I7ac8e3b5b0110825dc93e4fa885281db91c6cf83 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* remove nonsensical claim about contains()Oswald Buddenhagen2014-11-131-2/+3
| | | | | | | | | | | | | the string is implicitly anchored, so "foo" does of course not match "no-foo". this allows us to de-noise the generated qfeatures.pri somewhat. it still makes sense not to auto-include that file for performance reasons, so this change is a functional no-op. Change-Id: Ied75fd6459022c0b8c80843d62c4ab9eba9bf261 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* untangle use of system vs. shell path(-list) semanticsOswald Buddenhagen2014-04-301-1/+1
| | | | | | | | | | | | | | | "system" refers to the system's native shell, which is what qmake's system() invokes, and whose convention by far most commands invoked from a makefile will need. "shell" refers to the shell invoked by make, which diverges from the system shell only when qmake/mingw32-make is called from an msys shell. its conventions need to be used for anything the shell itself does (e.g., assembling env variables, but also command line argument unquoting) and the commands the mkspec sets according to the shell (e.g., QMAKE_MOVE). Change-Id: I0000aa9417c199cf8a810619d31ded24bb0675f9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* move generation of qconfig.h forwarding headers to qtbase.proOswald Buddenhagen2014-02-281-0/+8
| | | | | | | less platform-specific code. the qfeatures.h generation is already here. Change-Id: Ied69fb431eed5816fbff63b33be431ee913c2bc8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* QNX: Add support for lgmonBernd Weimer2014-02-141-0/+1
| | | | | | | | | | | | | | Added configure test, whether lgmon (liquid graphics performance monitor) is available. The test is supposed to be positive only for internal BlackBerry NDKs currently. Added calls to initialize lgmon and to indicate when an app is ready for user input. Change-Id: I5cbc29fb38a86585dcebd14d462436deaa1998aa Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-12-051-1/+1
|\ | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/macx-ios-clang/features/default_post.prf tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp Change-Id: Iaba97eed2272bccf54289640b8197d40e22f7bf5
| * don't install modules-inst dirOswald Buddenhagen2013-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | for in-source builds, we end up attempting to install the modules-inst dir in case we re-run qmake after some modules have been built. Change-Id: I50d4d394bfd6f48b9a5f5faa584919710a03dea9 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | mkspecs: add qfeatures.pri to installed filesPeter Hartmann2013-11-191-1/+1
|/ | | | | | | | | ... so it will be found when included. That file was added with commit 3b6b615334713cbfeb43409ff104244b55f4ce1f, "export QT_NO_<foo> equivalents to the build system" Change-Id: I38208aafe5b274d5976cec5d5149a41e6a963798 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-18 22:56:38 +0000