summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* fix default platform plugin for windows using configure scriptMark Brand2012-06-121-1/+3
| | | | | | | | | | Follow-up to 0074cc5d34a8ee314e864ba488dab1f0d0f94995. The configure script can be used for cross-building for Windows on unix. Change-Id: Ie7f9d0ff308ad5763cdf7b2664fa255e89bd5013 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Move the AVX and SSE tests to config.tests/commonThiago Macieira2012-06-121-7/+7
| | | | | | | This is the first step in supporting these checks on Windows. Change-Id: I77cfd46bd733161ad2e52c2f76a6354b95ff737d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Move the SSE2/AVX/Neon/etc. flags into the compiler mkspecsThiago Macieira2012-06-121-9/+9
| | | | | | | | | | | | | This allows us to have different flags for the compilers for supporting the same feature. For example, the official flag in GCC to support AVX2 is -mavx2, but ICC does not support it (yet), requiring -march=core-avx2 or -xCORE-AVX2. That flag, instead, enables support for all the features that the "Core-AVX2" processor (codename Haswell) will support. And clearly, the MSVC flags are different. Change-Id: I33b6d8617520925e807747180a8dbaafd79b7a9a Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Correctly detect blackberry mkspecs as cross-compiling for QNXSean Harmer2012-06-111-1/+1
| | | | | Change-Id: Ibcede225a0d6e421c086dba3cca5b0fcbeeafa68 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* configure: remove unused PLATFORMS variableGirish Ramakrishnan2012-06-111-6/+0
| | | | | | | | | | | | PLATFORMS is unused. Also remove the loop that printed all the PLATFORMS when the mkspec couldn't be autodetected. Even if the PLATFORMS variable was moved up, it wouldn't work anyway since it detects files and not directories. Change-Id: Id483c431a179fb01fcf680538e28c81763bc0b90 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* eglfs: Disable eglfs when evdev is not presentGirish Ramakrishnan2012-06-081-1/+1
| | | | | | | | | | | | EGLFS has a hard dependency on evdev, so don't compile it when evdev is not present. This also removes the check that disabled EGLFS specifically for QNX. Since QNX doesn't have evdev, EGLFS will get disabled automatically. Change-Id: I9fdb364b2eff9b370fa238609a8f98af6ccb7f7b Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix eglfs regression in configureDonald Carr2012-06-071-0/+1
| | | | | | | | | XPLATFORM_QNX was never explicitly set, yet the tests which evaluate it assume that it is. Change-Id: If97d2ee1f4432ada0c68e36348bf5bec85f94e43 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Do not build eglfs QPA when cross compiling for QNXSean Harmer2012-06-061-1/+1
| | | | | | | | | | | | Commit 2a1b50d67c1f2f4c5bd5efe048080989db37f44f introduced a dependency on evdev for eglfs which QNX does not provide. QNX also has a dedicated QPA plugin so the eglfs plugin is not needed there. It is not possible to use the -device configure defaults approach as it is not cross-platform. Change-Id: I2d151f16cf1a9576a0b0b528f0e9c17834c66e91 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* configure: Auto-detect and enable C++11 support if availableBradley T. Hughes2012-06-051-2/+30
| | | | | | | | | | | | | | | | | Enabling support for C++11 adds CONFIG+=c++11 to the Qt build. Projects using Qt can check for C++11 support using contains(QT_CONFIG, c++11) in their .pr[iof] files. The QMAKE_CXXFLAGS_CXX11 and QMAKE_LFLAGS_CXX11 qmake varibles contain any arguments the compiler needs to enable C++11. CONFIG+=c++11 adds these arguments to the build. Support for clang, g++, and the Intel C++ Compiler for Linux are included in this commit. Change-Id: Id77f86d7ad4d5c740b890446a40b105879a0d327 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Migrate fontconfig config test to unix scopeDonald Carr2012-06-051-1/+4
| | | | | | | | | | | Fontconfig has no X11 dependency and is of broader use to us than the X11 context. The test should also disambiguate whether fontconfig support is successfully detected or not. This change also removes a false X11 dependency from the freetype test. Change-Id: I68a596aa06f614a64163772fe29a09edba119a81 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Introduce gcc machinedump considerations to build systemDonald Carr2012-06-041-0/+9
| | | | | | | | | | This information is required by qmake when cross compiling for Debian based multi-arch devices in order to adequately resolve system libraries and pkg-config information. Change-Id: If96e677ab27c6f0453889c8f7cc43bdb9016f8b6 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* make pre-qmake spec evaluation load device variablesDonald Carr2012-06-041-2/+12
| | | | | | | | | this is needed to correctly resolve the compiler (cf. $$CROSS_COMPILE) Change-Id: Iaf7266ae464c15e8483780dcf9c970212630a93b Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com>
* configure: pass -D options through to configure testsRohan McGovern2012-06-011-82/+82
| | | | | | | | | | | | We already do this for -I and -L compiler flags, but not -D. This caused configure tests to give incorrect results in some cases. Task-number: QTBUG-25963 Task-number: QTQAINFRA-523 Change-Id: Ib270a1dc67759e36bc439e80ab8136a64c405d26 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Move the sub-architecture feature to better places in qmakeThiago Macieira2012-05-311-2/+2
| | | | | | | | | | | | | | | | | | | 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>
* Fix typo in temporary filenamekb2012-05-311-1/+1
| | | | | | | | | The configure script uses the bash $"..." string internationalization syntax; this generates an error in other shells. Since this feature is only used in one place it is likely a typo. Change-Id: I076a785c3901b04175b8669e32c55989385720e3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Record the sub-architecture (CPU features enabled in the compiler)Thiago Macieira2012-05-301-6/+12
| | | | | | | | | | | | | If the system's compiler has extra features on top of the base settings enabled or if the mkspec or $CXXFLAGS variable included some, record them. This will allow us to choose whether or not to use our own special compilers, based on whether the system default compiler contains it or not. Change-Id: I87cada9fab4cfa58846a831d0a7c7b50d8fa87fd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Improve the architecture-detection mechanismThiago Macieira2012-05-301-3/+21
| | | | | | | | | | | | | | For the Unix part, this now obeys the -v option, printing the full command-line it used to compile, allowing testers to identify why something went wrong. Unfortunately, it requires a full compilation cycle, instead of just preprocessing. Just one more among the many on Unix, but maybe a noticeable slow-down on Windows. Change-Id: I654b70d99887e04c96731a5b91be9ad555e4d8fe Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* fix QT_GCC_*_VERSION definition after exception option removalOswald Buddenhagen2012-05-251-2/+2
| | | | | | | | | sometimes it pays off to actually check where variables are used ... Change-Id: Ia91c89cb963ace50f432c54ffe5f57366ccd5603 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Allow a space between "-l" and library name when configuringkb2012-05-231-2/+7
| | | | | | | | Qt's configure allows for spaces between an option and its argument. This patch brings -l in line with -L et al. Change-Id: Iea5c78dc06f69c21b7419fd9fa73c52ae1cea18f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* -device: c01621ec8 broke device featureGirish Ramakrishnan2012-05-191-0/+2
| | | | | | | result was never returned by resolveDeviceMkspec Change-Id: Ibd2f647e5524cdc9dbf4ea06f7b815f9dcc43212 Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
* device: Allow specifying shortnames for device mkspecsGirish Ramakrishnan2012-05-191-1/+17
| | | | | | | | | Specifying -device linux-amlogic-8726M-g++ is error prone. With this change, one can specify any substring of the mkspec names under devices/ and the first one will be picked. Change-Id: I7c4522fdaefe4a11e9292f7831075aa766a62c0b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Blacklist Apple clang 3.0 and previous support for AVXThiago Macieira2012-05-181-1/+22
| | | | | | | | | | | | | | | | | | | | In at least one case found in our testfarm, the compiler runs into an ICE (Internal Compiler Error) compiling the new AVX code. The error it reported was: fatal error: error in backend: Cannot select: 0x7fbf1aa42210: f64 = sint_to_fp 0x7fbf1aa88a10 [ORD=1936] [ID=37] 0x7fbf1aa88a10: i32,ch = CopyFromReg 0x7fbf19538768, 0x7fbf1a9f2610 [ORD=1936] [ID=27] 0x7fbf1a9f2610: i32 = Register %vreg38 [ORD=1936] [ID=9] As is the nature of ICEs, juggling the code around will probably make it pass. But since I have plenty more AVX changes pending, which make the code even more complex, it's also very likely that this issue will happen in other places. For that reason, I choose to blacklist the compiler instead. Change-Id: Ide3201f0cc49c7ceb63e966f6de65a8315cbea4b Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* turn off exceptions by default where they aren't requiredLars Knoll2012-05-171-90/+2
| | | | | | | | | | | | | 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>
* configure: save pkg-config env in qconfig.priJohannes Zellner2012-05-141-0/+8
| | | | | | | | | | Store PKG_CONFIG_SYSROOT_DIR and PKG_CONFIG_LIBDIR for the usecase of cross compilation in qconfig.pri. They will get picked up by pkgConfigExecutable() in qt_functions.prf used from link_pkgconfig.prf as environment for pkg-config calls. Change-Id: I7d0de05c0bd21b435275fc26c66a80035ba30970 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* configure: Remove the -dwarf2 argument for Mac OS X buildsBradley T. Hughes2012-05-111-26/+1
| | | | | | | | | | Modern versions of Xcode properly support dwarf2, and as such dwarf2 is always enabled. This change removes the ability to turn it off, making dwarf2 non-optional. Change-Id: I149daeae6048ee8a1ed116363572173ad219102e Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove "file qmake"-based arch detection.Morten Johan Sorvig2012-05-041-24/+0
| | | | | | | Change-Id: I0b6b66eb439c7f0f566b74cc3da0726a5ecbac34 Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* configure: Escape '{' in getQMakeConf2 functionSergio Ahumada2012-05-011-1/+1
| | | | | Change-Id: I7df0ca940a76b80d7b0da24dbedbabd2b8736bb8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make QGtkStyle work on Qt 5.Morten Johan Sorvig2012-04-301-0/+26
| | | | | | | | Mostly straightforward porting: Add configure test from Qt 4. Add X11 include to qgtkstyle_p.cpp. Use renamed QGuiApplicationPrivate::showModalWindow. Change-Id: I83020e13ec00b49f3fe346814f881bce19a6f602 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix detection of default platform plugin.Girish Ramakrishnan2012-04-191-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let configure generate the QT_QPA_DEFAULT_PLATFORM_NAME in qconfig.h. This allows us to override the platform name using a configure argument. This commit adds -qpa <platform> that lets the user specify the default platform at configure time. Note that the default platform is not checked against the tree since plugins are allowed to exist outside the Qt source tree. In the absence of -qpa argument, configure checks the mkspec for a variable named QT_QPA_DEFAULT_PLATFORM. This check is implemented only in the unix configure because it will be primarily used in custom mkspecs (devices, boards). If -qpa argument is absent and the mkspec variable is absent, the default value is determined based on the OS as below: Unix - "xcb" Windows - "windows" Mac - "cocoa" QNX - "qnx" Done-with: Jørgen Lind Change-Id: I0df31811a1b901a3242bfada1232e596ebda04f4 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* -device: create qdevice.pri only when build tree is initializedGirish Ramakrishnan2012-04-191-9/+9
| | | | | | | | | | | | The build tree is not initialized when -help is passed to configure. The mkspecs/ directory is not created and thus the mv fails results with the following error: mv: cannot move `.device.vars' to `/tmp/qtbase/mkspecs/qdevice.pri': No such file or directory The solution is to create qdevice.pri just before we run config.tests. Change-Id: Ie83018e27a03bb840d213aae8c963b0074e62bb4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Don't fail to configure if QNX platform plugin is built.Stephen Kelly2012-04-191-1/+2
| | | | | | | Change-Id: I781eab2fb07fe62d733317b8a72dd899caaf5a80 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add a functionality test for DirectFB to ensure it compiles.Thiago Macieira2012-04-191-2/+13
| | | | | | | | | | | | | | | | | | | | | Some versions of the DirectFB headers are unclean and will cause Qt compilation failures. So blacklist those versions. Version 1.5.3 (present in Fedora 16) is known to be buggy and gets disabled by this patch. The compile error was: qurlquery.h:169:5: error: ‘typeof’ was not declared in this scope (qplatformcursor_qpa.h includes qevent.h which includes qurl.h which includes that) The error comes from the Q_FOREACH expansion. Note that Q_FOREACH uses __typeof__, so it's supposed to be safe, unless someone ill-advised goes and defines the GCC "safe" macro (double underscores on both sides) to something else. Change-Id: Ida41ee3b3c2fcba86a7e12182e7055123166693b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 10:01:37 +0000