summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* Introduce an option to disable stripping during installationThiago Macieira2012-09-241-0/+12
| | | | | | | | | | The default is the current behaviour: strip on installing release, no strip on installing debug. This option does not change the installation of debug builds because qmake does not support that. Change-Id: Ic208d5ffe860d5f1ee1cafdc944e12001673d33f Reviewed-by: Davide Pesavento <davidepesa@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* configure: Update contact information for commercial usersSergio Ahumada2012-09-221-13/+13
| | | | | | | | Task-number: QTBUG-23949 Change-Id: Iaca7f45eae39ab7f6368431daead93358b17fe36 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sinan Tanilkan <sinan.tanilkan@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-221-24/+24
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: If1cc974286d29fd01ec6c19dd4719a67f4c3f00e Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* configure: remove CONFIG features while getting PKG_CONFIGMark Brand2012-09-221-1/+1
| | | | | | | | | When qmake is used to get PKG_CONFIG, core and gui are not available. This motivates CONFIG-=qt. In fact, we don't need any features for this job. Change-Id: Id247054d43c50f6aeb62db7585c3e90f57aa36a1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* syncqt only the QtCore headers for the bootstrapOswald Buddenhagen2012-09-191-1/+1
| | | | | Change-Id: I26e19805823bfe987c721f6a274803e54f0e4003 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* use qmake to get PKG_CONFIG in configure scriptMark Brand2012-09-171-12/+12
| | | | | | | | | | | | | The value of PKG_CONFIG might depend on device options. For example, "-device-option PKG_CONFIG" might be used with configure or a mkspec might prefix PKG_CONFIG with CROSS_COMPILE which is specified as a device option. The shell functions of configure for parsing mkspecs do not take device options into account, but qmake is pretty good at it now. Change-Id: I1c9558e550c48e8441ebdac34b82066473c2ce3a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Make maemo scope syntax in project files more genericLaszlo Papp2012-09-141-1/+1
| | | | | | | | | | | | | | | | | It is necessary to use the n9 device file for now in scratchbox or/and on the community open build service because the maemo platform mkspecs file assumes that a cross-toolchain is used all the time. If no platform file is used, then for instance certain plugins may not be built in general. There is currently an ongoing issue with the meego plugin for context management in the Harmattan components project. That is currently not built due to this issue, so no orientation works in those applications. The nice solution would be to make the maemo platform file work with cross and native toolchains as well, but that requires a decent amount of investigation and work. Thereby, the scope is extended this way for now. Change-Id: I172c7d152bdbb2db279526d9fd1ca5648d0cd0a9 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Add c++11 option to configure.exeKai Koehne2012-09-131-1/+1
| | | | | | | | | | Also check for c++11 support in configure.exe (which is also used by MinGW builds). The c++11 check is therefore moved from 'unix' to 'common' directory. Change-Id: I082848f032c2770e52e34f331b83820f395c06b6 Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Yuchen Deng <loaden@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* unscramble option help textMark Brand2012-09-131-3/+2
| | | | | Change-Id: I1e38aced5c3188c4db470e26fa117b0dd08bf100 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add configure -help output for the ICU option.Thiago Macieira2012-09-121-0/+3
| | | | | | Change-Id: I922d3fd4d3c2d9e8e844dfb661a91934e4b05aea Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Partial revert "cross compile with mingw": unbreak pkg-configMark Brand2012-09-121-1/+0
| | | | | | | | | | | | | | | | | This partially reverts commit 07a978d3d4b41739eff1061dc45dbfa737bf78b9. Despite what the commit message said, pkg-config previously worked and was useful, particularly for static Qt. Qt itself even installs its own .pc files. Note: The mkspec win32-g++-cross had a PKG_CONFIG definition to avoid using the pkg-config installation on the build machine. Change-Id: Ia4a8d18cd57f74a00bdb9b6a171d20151978a9cc Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Peter Kümmel <syntheticpp@gmx.net> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* don't require (dummy) qconfig.h for qmake buildOswald Buddenhagen2012-09-111-24/+1
| | | | | | Change-Id: I22a2c9aa1366ff858b3bb646617543968c810136 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* introduce -minimal mode to syncqt and use it for bootstrappingOswald Buddenhagen2012-09-111-1/+1
| | | | | | | | | | the bootstrap does not need CamelCase includes, deprecated headers and whatnot, so just don't do it. the full thing will be run on qtbase by qmake. Change-Id: Idffdd4750a73574c8c32ee75d00080abfe37e03c Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* call syncqt unconditionally in configureOswald Buddenhagen2012-09-111-6/+1
| | | | | | | | ... provided perl is available. configure.exe already does that, and there is no reason not to. Change-Id: If398864697fcfbe4545248cec33e70a1ec4a29a3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* clean up syncqt invocationOswald Buddenhagen2012-09-111-1/+1
| | | | | | | it needs no special env variables any more Change-Id: I60a7ab6eabb9280b02cd510418c0842d05fc1306 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* move syncqt -check-includes handling to default_pre.prfOswald Buddenhagen2012-09-111-1/+0
| | | | | | | | 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>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 05:48:36 +0000