summaryrefslogtreecommitdiff
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Enable autodetecting of EGL event for desktop GLJorgen Lind2012-09-071-1/+1
| | | | | | | | And only use the QT_CONFIG,egl syntax in eglconvenience Change-Id: I81c0602334714f4b27a7e90e7b5859c989e6bd63 Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com> Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
* Rename MAC_CONFIG_TEST_COMMANDLINE to MAC_SDK_FLAGDanny Boelens2012-09-031-7/+8
| | | | | | | | The Mac OS X SDK is the only thing that variable is used for, so give it a name that better fits its use. Change-Id: Ifd9866bc19edda0e9f0bcb17270eb26a8849401e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove the package macros from qglobal.hThiago Macieira2012-09-031-39/+17
| | | | | | | It's the wrong place to have these. Change-Id: I3b716317ba02ea2baf0f7053c8b16128e4c88e17 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* mips: Autodetect MIPS DSP rev1 and rev2 instructionsetHolger Hans Peter Freyther2012-09-011-8/+16
| | | | | | | | | | Not every MIPS SoC has the DSP extensions, auto-detect them by using builtin GCC functions. Check for the DSP macros and add the result for rev1 and rev2 to the cpufeatures. Change-Id: I3d6c950f170f102514c43b349f9a23ee796d801a Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Use pkg-config to search for all XCB dependenciesThiago Macieira2012-08-311-2/+2
| | | | | | | | | The XCB platform plugin requires several XCB libraries to work. Without this fix, we get the build error in compileTest only, which is hard to check. Change-Id: I6b599f5ad32661e9dc01db11705d702920350cfa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* filter standard paths from mysql_config & pg_configOswald Buddenhagen2012-08-251-5/+65
| | | | | | | | | | | | | | | | | | standard paths should never be added to compiler/linker lines, as they are likely to mess up the lookup order. pkg-config does that filtering for us, but the home-grown config tools don't, so we need to take care of it. configure.exe does not have such auto-detection, so the change is not necessary there. Task-number: QTBUG-26850 Change-Id: I2f523d5cffb27c3d0a16cdef6ca8a4877c9983c0 Reviewed-by: Mark Brand <mabrand@mabrand.nl> Reviewed-by: Mitch Curtis <mitch.curtis@nokia.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Move the QT_COMPILER_SUPPORTS_xxx defines to qconfig.hThiago Macieira2012-08-221-1/+14
| | | | | | | | | | | | | | | | This reduces dramatically the command-line for compiling Qt sources. These are private macros, only to be used by Qt's own modules, so the compiler setting is either the same or, possibly, better. In other words, in the worst case, when compiling a module with a better compiler than for qtbase, such module might not enable all the functionality it could otherwise do. If we switch to a buildsystem that can support this properly in the future, these macros should be removed. Change-Id: I71f2d12ec98c9dd40eaab9de4a17446bd1066020 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* make configure set up QMAKE_DEFAULT_{INC,LIB}DIRSOswald Buddenhagen2012-08-221-1/+17
| | | | | | | | | | | | | | hard-coding it in unix.conf was no particularly good idea for hopefully obvious reasons. the windows version is so far just a stub that does what the makespecs hard-coded - more doesn't seem worth the effort. the guys interested in x-building may want to rectify it at some point, but it's not going to be easy. Change-Id: I8fedd841a8416f8c0c57018752eae9510b5d00d0 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* cross compile with mingwPeter Kümmel2012-08-211-1/+7
| | | | | | | | | - improve defaults - fix linker errors Change-Id: I7e1deb55fb616a3890510806593a0ab9a0a31d9a Reviewed-by: Yuchen Deng <loaden@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* remove unnecessary magicOswald Buddenhagen2012-08-171-2/+0
| | | | | | | getXQMakeConf now gives properly expanded variables Change-Id: I17d82a1889fc4e1ee6b74c90aa0e4179ece0e415 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Merge L_FLAGS and l_FLAGS in configureThiago Macieira2012-08-141-6/+4
| | | | | | | | | | This is prompted by the fact that QMAKE_LIBDIR_FLAGS is no longer honoured by qmake, so we need to use LIBS. It didn't make much sense to have the flags separate anyway... Change-Id: Iaec4d58f9dbac25755bbc3bad7550e03edb5332b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* introduce compileTest functionOswald Buddenhagen2012-08-141-79/+88
| | | | | | | | | | | this cuts down the enormous duplication of identical command line args passed to compile.test. this necessitates the addition of a -config parameter to compile.test, as QMAKE_CONFIG needs to be extended in some cases. Change-Id: I677b2fea4a407b9e4395e70a25e4e349efb0a946 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add Linux Accessibility BridgeFrederik Gladhorn2012-08-141-6/+20
| | | | | | | | This is a plugin that bridges the QAccessible world to AT-SPI 2 on Linux. Change-Id: I7af22621ee6a3cefc723b137b7f227a611cf6641 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* support -rpath for modules which are not installed to QT_INSTALL_PREFIXOswald Buddenhagen2012-08-111-6/+3
| | | | | | | | | | | | | a module's project file may set MODULE_INSTALL_LIBS before loading qt_module.prf to have an alternative RPATH linked into the users of that module. this is relevant only for linking against non-installed -prefix builds of that module, as otherwise .libs from the module's pri file is used for rpath. Change-Id: Ib240e748cf130a71a5991dc643c368a983092ead Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Make it possible to force generation of debug info in release buildsAndreas Holzammer2012-08-091-0/+13
| | | | | Change-Id: Ie79e5a6a87475d5140163a2a547b4385a53fc05f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Define QT_NO_FOO also when -no-foo is passed to configure.Davide Pesavento2012-08-081-3/+9
| | | | | | | | This fixes a build failure that happens when Qt is configured with -no-libudev, as reported at https://bugs.gentoo.org/show_bug.cgi?id=430292 Change-Id: I924f023505ab57cca5994f2fd5ff2f8308e61617 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix builds with sysroot: a space is necessary before ] in scriptsThiago Macieira2012-08-061-1/+1
| | | | | | | | | | | When using [ ] for tests in shell scripts, the ending ] must be a separate parameter. Otherwise, it won't work. configure was reporting: configure:5918: ']' expected Change-Id: I38a843356ee0feb97edb8692a828306821045c77 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* introduce -fully-process configure option, change behavior of -processOswald Buddenhagen2012-08-061-7/+19
| | | | | | | | | | | configure will now run qmake without -recursive, as on modern systems one can get a lot more out of parallelization done by make, which qmake cannot do. use -fully-process to get back the old behavior. -dont-process is unchanged. Change-Id: I2874321a963175463ae8992f3ab2b01bc13c9922 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove phonon vestigesOswald Buddenhagen2012-08-061-22/+0
| | | | | Change-Id: Ifae2c631ddaae95ad9fc92e1f768fd910b254292 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove the option summaries from the configures' help messagesOswald Buddenhagen2012-08-041-26/+1
| | | | | | | | | they are an unreadable and unmaintainable mess. the options are properly documented below. Change-Id: If2ec683fb7c3740b19798979f8a1f9cd8d84f457 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove unused Q_WS_QPA define.Stephen Kelly2012-08-031-1/+1
| | | | | | Change-Id: Ie77526000cf93ad6901e28abe2558d254ccf8f1a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* Remove some dead QWS code from configure.Stephen Kelly2012-08-031-1/+1
| | | | | Change-Id: Ic1b47533e3f04cebaac83ca632068c2e791a846c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Adding configure option: -no-gcc-sysrootThomas Senyk2012-08-011-3/+8
| | | | | | | | | | | | | | | | | | This option is important if you want to use configure's and qmake's -sysroot (e.g. PKG_CONFIG settings, device-files), but the toolchain (in combination with the rootfs) is not able to handle gcc's --sysroot. One known case is freescale's ltib setup where the toolchain itself comes with all the essential files (e.g. crt1.o), while the rootfs has none of those files, so gcc's --sysroot can't be used. The rootfs on the other hand contains all kinds of "less important" files/packages (e.g. libdbus). For those "less important" files/packages Qt needs pkg-config to be able to include/link properly. Therefore one needs configures -sysroot without gcc's --sysroot. Change-Id: Iaec9b07012f2945f3ecb3ced0ed95176721b5ecd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* don't set -rpath-link in qmodule.priOswald Buddenhagen2012-07-311-4/+0
| | | | | | | qt.prf takes care of that already Change-Id: Ibc426583a007edbbe2f53cc21ce676eb60b33485 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix Mac OS X architecture detection for non-default Xcode setup.Danny Boelens2012-07-211-4/+4
| | | | | | | | | | | | | The arch.test script is now using SDK settings passed to it. If you install Xcode without the "UNIX Development" option, this is essential to let the compiler find standard headers and let the test program compile successfully. In addition, let configure pass the SDK settings given on the command line to the arch.test script. Change-Id: I49601d3068d83a71e21fdbac287857f2b7abedd1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix typo in configure for Mac: Libraries -> LibrarySergio Ahumada2012-07-181-1/+1
| | | | | | Task-number: QTBUG-18115 Change-Id: I81f82d417dfff94c0ebcd41f0f9f3cd3223bac2c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add config test for kmsLaszlo Agocs2012-07-181-2/+59
| | | | | | Change-Id: I55afc65d356aaca0fe443dda100805a4df8f0ae6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Set correct QT_LFLAGS_SQLITE for default cases.Rafael Roquetto2012-07-171-0/+3
| | | | | | | | | In systems where no pkgconfig is available, such as QNX, we set QT_LFLAGS_SQLITE to the default values. Change-Id: I24edd589ce7baf2614480a91842ca756ead39463 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* linuxfb: Add config.test and configure supportGirish Ramakrishnan2012-07-111-2/+41
| | | | | | | | | The code is exactly the same as what is already done for DirectFB. Change-Id: I3b84e67a3e999f692da4110f3ac9c82d98b0637c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* configure{.exe}: enable 'tools' as a default build partRohan McGovern2012-07-101-1/+1
| | | | | | | | | | | Tools for each module should be enabled by default. Prior to qt_parts.prf, they have been enabled by default, but only by accident - the value of QT_BUILD_PARTS with respect to 'tools' was generally not respected. Change-Id: Icd49d6128d4050ff1c865967a563e9ab88c5a3a2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* make QT_BUILD_PARTS setting in qmodule.pri additiveOswald Buddenhagen2012-07-091-1/+1
| | | | | | | | that way it is actually possible to add additional parts from the qmake command line. Change-Id: I42e0b58424292cebafb57538a879204d370397bb Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* don't blow away mkspecs/modules-inst when reconfiguringOswald Buddenhagen2012-07-051-0/+9
| | | | | | | | | | | | | otherwise we get lots of nasty warning messages about missing pri files. it is arguable whether it is a good idea to do that, but we preserve mkspecs/modules, too, and the previously built libraries don't just vanish, either. Change-Id: Ieded8d8858f1b0135bc3bea894b4a676024ac8ca Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* export QMAKESPEC to the projectOswald Buddenhagen2012-07-031-12/+0
| | | | | | | | | | this makes it unnecessary to dump qmakespec to .qmake.cache and qmodule.pri. Task-number: QTBUG-22700 Change-Id: I678c7ee7df2512184b9cd06d7a3be8bbd0b0da15 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* store QT_BUILD_PARTS in qmodule.pri also on unixOswald Buddenhagen2012-07-031-1/+1
| | | | | | | | | modules other than qtbase also need it. the windows configure already does it that way. Change-Id: I9adb469f7a0726663b7939e80d8be1e83a6d12d3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* don't match on the spec name in qconfig.priOswald Buddenhagen2012-07-031-1/+1
| | | | | | | | | | | | this will fail now even on unix (and wouldn't have ever worked on windows), as the full spec name is known only after reading the spec, and qconfig.pri is read from inside the spec. matching on the host_build flag is cleaner anyway. Change-Id: I7da144e89ab3db0fad942d755d8cb0a0f3b85588 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Donald Carr <sirspudd@gmail.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Move DirectFB tests into qpaGirish Ramakrishnan2012-07-031-1/+1
| | | | | Change-Id: I15c90e2e8befef5529b35fa02d3ca6d67a409cc7 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* configure: properly quote glesv2 flagsRobin Burchell2012-07-031-4/+19
| | | | | | | | | | | | | | | | | | | | pkg-config returns glesv2 build flags, which are parsed into a few variables. However, extra spaces get included in these variables and quoted, which makes includes paths not work. This problem can only be hit, if you do not have GL ES 2 headers installed system-wide, but you do have installed into $prefix, and pkg-config configured to return the configuration for $prefix. Even though pkg-config returns correct paths, extra space gets included. Fix it by parsing the strings returned by pkg-config just like a shell would parse a command line. pkg-config escapes e.g. spaces, so those escape sequences need to be interpreted, while doing word-splitting. The result is a quoted list, as expected in the qmake files. Done-with: Pekka Paalanen <ppaalanen@gmail.com> Change-Id: I0593ef7e0606ac5ea80da046e45f86806206951a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* buildsystem: Remove SXE from the configure and qconfig-*.h filesHolger Hans Peter Freyther2012-07-021-10/+0
| | | | | | | The SXE feature was used with Qtopia but is long gone. Clean it up. Change-Id: I55fba97b6382300ba63e94f3a6c415227f571e37 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Basic tablet support in xcb through XI2Laszlo Agocs2012-06-281-15/+14
| | | | | | | | | | The Maemo-specific function have been renamed a bit to prevent them clashing with the more generic stuff. Task-number: QTBUG-25865 Change-Id: Id55693159e15d5a0c679546eb48308feb48acac9 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Update the macros for shared/DLL and static buildsThiago Macieira2012-06-281-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Up until now, we had a mess of different macros used for building DLLs, for building shared libraries on Unix systems and for building static libraries. Some of the macros were contradictory and did not work. From now on, there shall be only: - QT_STATIC: indicates that it's a static Qt build and the export macros should expand to empty - QT_SHARED: indicates that it's a shared / dynamic Qt build and the export macros should expand to Q_DECL_EXPORT or Q_DECL_IMPORT, depending on whether the macro corresponds to the current module being built (the QT_BUILD_XXXX_LIB macro comes from the module's .pro file) QT_BOOTSTRAPPED implies QT_STATIC since the bootstrapped tools link statically to some source code. QT_STATIC is recorded in qconfig.h by configure when Qt is configured for static builds. Nothing is recorded for a shared / dynamic build, so QT_SHARED is implied if nothing is defined. This allows for the existence of a static_and_shared build: with nothing recorded, defining QT_STATIC before qglobal.h causes the export macros to be that of the static form. Linking to the static libraries is out of the scope of this change (something for the buildsystem and linker to figure out). From this commit on, the proper way of declaring the export macros for a module called QtFoo is: #ifndef QT_STATIC # ifdef QT_BUILD_FOO_LIB # define Q_FOO_EXPORT Q_DECL_EXPORT # else # define Q_FOO_EXPORT Q_DECL_IMPORT # endif #else # define Q_FOO_EXPORT #endif The type of the Qt build is recorded in QT_CONFIG (in qconfig.pri) so all Qt modules build by default the same type of library. The keywords are "static" and "shared", used in both QT_CONFIG and CONFIG. The previous keyword of "staticlib" is deprecated and should not be used. Discussed-on: http://lists.qt-project.org/pipermail/development/2012-April/003172.html Change-Id: I127896607794795b681c98d08467efd8af49bcf3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* purge QMAKE_INCDIR_QT and QMAKE_LIBDIR_QTOswald Buddenhagen2012-06-191-4/+0
| | | | | | | they are equivalent to QT_INSTALL_(HEADERS|LIBS)/get. Change-Id: Ic4b47f3ca7db55785b96f19020a2fa020a8d25bd Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* introduce /get property variantsOswald Buddenhagen2012-06-191-0/+10
| | | | | | | | | | | | | | | properties are now split into a write location $$[FOO] and a read location $$[FOO/get]. the write locations are hard-coded and configurable via qt.conf/Paths as before, while the read locations are configured via qt.conf/EffectivePaths. this finally provides a clean solution to the problem that during the qt build itself tools and libraries need to be taken from somewhere else than they are installed to. Change-Id: I956c43bd082afd465e690fe75d0bee3c2c0f7c25 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* -qconfig needs no own switch case any moreOswald Buddenhagen2012-06-191-7/+1
| | | | | Change-Id: I56c14cb7a2bf9e6641c48574d2b13436c1b7f714 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* remove the insane switch case for qt-style yes optionsOswald Buddenhagen2012-06-191-6/+2
| | | | | | | | | it only serves to create merge conflicts. the treatment is the same as for "unclassified" options anyway (they ignore the value, so it can be "yes" just as well). Change-Id: I9a75769338b4dc1f58493f1a1f1dd2c2e895290a Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* make makefile generation under unix saneOswald Buddenhagen2012-06-191-209/+32
| | | | | | | | | | 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>
* properly declare the host tools as such in the project filesOswald Buddenhagen2012-06-191-12/+6
| | | | | | | don't mess with the qmake cmdline args any more. Change-Id: I399d87145d31d25e29951b6acd96387a3c7282f0 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* introduce ability to build projects for the host systemOswald Buddenhagen2012-06-191-3/+9
| | | | | | | | | | | | | | | | | 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>
* Do not add debug/release to QMAKE_CONFIG. Let module system enable themSean Harmer2012-06-141-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This solved QTBUG-26111 in which qtjsbackend gets built with an incomplete framework on Mac OSX. This was traced back to commit 6a6fd56e662b2c1a581727f7ec44d5bd60913ad4 which moved QMAKE_CONFIG values from .qmake.cache to mkspecs/qmodule.pri. Since qtjsbackend contains config tests it creates its own .qmake.cache which was previously masking this issue. QMAKE_CONFIG incorrectly contained debug for debug_and_release builds even though debug and release are already present in the CONFIG variable in mkspecs/qconfig.pri. The changes to configure prevent CONFIG in qmodule.pri from containing debug and release variables and ensure that QT_CONFIG contains build_all and debug_and_release if appropriate. Configure.app is also adjusted to match this behaviour. The other part of the change is to qt_module_config.prf and qt_plugin.prf. These changes take care of populating CONFIG with the appropriate debug_and_release and build_all variables depending upon what is present in QT_CONFIG. This ensures that the Qt modules and plugins get built with the same configuration as qtbase. The special handling for the qcocoa QPA plugin ensures that it is built in release mode only to preserve the behaviour introduced by commit 5603f94eaa538dbe28fc426065d65a27799adedc. Task-number: QTBUG-26111 Change-Id: I6f65aba50709e1b2431b8b4411ff30a06f7d8aed Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* -device: Use $1 instead of $VALGirish Ramakrishnan2012-06-121-3/+3
| | | | | | | | | $VAL just happens to work in resolveDeviceMkspec because it is set in the parent shell environment when the function is called. Change-Id: I67350f2a9e790cc7eca2a73ef6a4a0d7f09b8d3c Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
View Lorry Controller Status