summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtbase into newdocsJerome Pasion2012-11-021-11/+29
|\ | | | | | | Change-Id: I7e6cee190a341901dfbf8effb54ebccb91bf7a17
| * move remaining configure'd CONFIG flags to qmodule.priOswald Buddenhagen2012-11-011-4/+1
| | | | | | | | | | | | | | | | so they are uniformly available to all modules. Change-Id: I734f703c5923c42cb26f1456ed960cecc01c4b41 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * rewrite default spec handlingOswald Buddenhagen2012-11-011-5/+5
| | | | | | | | | | | | | | | | | | | | 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>
| * QtNetwork: introduce configure switch to use system proxies by defaultPeter Hartmann2012-10-301-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | This option is opt-in (default: no). When configured with "-proxies-system-default", Qt automatically picks up the system proxies. Change-Id: I8cc002f29587854f448d97117b08c43d8eedec76 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Merge remote-tracking branch 'gerrit/master' into newdocsTor Arne Vestbø2012-10-261-6/+12
|\| | | | | | | Change-Id: I10cf9f915c602c8e5a0e7d7c9e17b7bc5ca00640
| * configure: make sure that global shadow doc symlink is always updatedTor Arne Vestbø2012-10-221-1/+1
| | | | | | | | | | | | | | We forcibly overwrite the symlink - in case the source dir changes. Change-Id: I3986b968f787ea0d250887113a0c223e10038546 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Remove Cleanlooks and PlastiqueJens Bache-Wiig2012-10-221-1/+1
| | | | | | | | | | | | | | | | | | We have a new style Fusion that will replace these styles. They will be moved to a separate module rather than included in platforms that do not need them. Change-Id: I51ebbcad5406e99130e5b12e62ba624d1489088c Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Made xcb plugin work when the GLX extension is not present.Samuel Rødal2012-10-191-0/+6
| | | | | | | | | | Change-Id: I9285d7524586ff404206c088019ece33335137d9 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * configure: state compiler explicitly when testing for supported flagsPeter Hartmann2012-10-191-5/+5
| | | | | | | | | | | | | | ... so we can test those functions with host and cross compilers. Change-Id: Ifebfdac54580633c797f77b139514cf9d66edd8c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | configure: make sure that global shadow doc symlink is always updatedTor Arne Vestbø2012-10-251-1/+1
| | | | | | | | | | | | | | We forcibly overwrite the symlink - in case the source dir changes. Change-Id: I3986b968f787ea0d250887113a0c223e10038546 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Add config option to build documentation as a two-step processTor Arne Vestbø2012-10-251-1/+1
|/ | | | | | | | | | | | | | | | | | | | The new 'prepare_docs' CONFIG option triggers the documentation rules in default_post to generate two extra targets: prepare_docs and generate_docs. The prepare_docs stage runs qdoc with the -prepare option, which means qdoc will only generate index files, and the generate_docs stage will call qdoc with -generate, which reads the index files and generates the final output. The regular docs target will then run the prepare_docs target for all submodules before running the generate_docs target. This ensures that when generating the final output, qdoc has all the index files for all the other modules available, to be able to resolve cross-references between the various Qt modules. This patch needs a follow-up in qt5.git to add CONFIG+=prepare_docs, so that the root Qt5 build will be able to hook into this new behavior. Change-Id: I654d7f0d4d5a41d9be208e6d3a8923bf0194f9ad Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Rename the syncqt -qtdir to -mkspecsdirThiago Macieira2012-10-191-1/+1
| | | | | | | | | It's actually looking for the mkspecs (so it can read qconfig.pri to get the Qt version), so give it exactly what it wants. Change-Id: I2957b2d93a8837b8492d313209d45ff3ec01704c Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Introduce new style FusionJens Bache-Wiig2012-10-181-1/+1
| | | | | | | | | | This is a new non-native style for Qt. It is intended as a replacement for the now aging Plastique and Cleanlooks styles. Change-Id: I30c0518a69e4e3b8b2b05ee7d84c3a5a1f307578 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* add a .qmake.conf file which load()s qt_build_configOswald Buddenhagen2012-10-181-1/+0
| | | | | | | | | | | | | | that way we don't have to auto-generate code for that in the configures. note that we now load qt_build_config.prf instead of just qmodule.pri, which means that exceptions_off is set everywhere. we forcibly re-enable them for testcases to minimize the deviation from default 3rd party usage. testlib selftests are not qt testcases, so the one that needs exceptions needs to enable them explicitly. Change-Id: I1b9360bb11f2e80c92a2b63a7c45991ad17fda1b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Remove mention of freetype options in configure.Samuel Rødal2012-10-171-5/+0
| | | | | | | | | | These options were only used for QWS in 4.x, and their documentation should have been removed as part of f220f99a6d13a395ca723e9f9. Task-number: QTBUG-27369 Change-Id: Ia85a20bdac40087c02f6876f53ce21568759d697 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* remove apparently dead CONFIG+=dylibOswald Buddenhagen2012-10-161-1/+1
| | | | | Change-Id: Ib7d1739e6a283bb93179345adb9470ac1f064ec8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Mac OSX: configure will use clang for any version >= 3Shawn Rutledge2012-10-131-4/+2
| | | | | | | Task-number: QTBUG-26140 Change-Id: Ifee00a9d15b053bb9d2c7b0d9bedca45e4d589d3 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Modularize documenation buildTor Arne Vestbø2012-10-101-3/+3
| | | | | | | | | | 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>
* configure: bump gtk version from 2.10 to 2.18 (sep 2009)J-P Nurmi2012-10-081-1/+1
| | | | | | | | | GTK_WIDGET_TOPLEVEL was deprecated in 2.20 and no longer available in gtk 3. gtk_widget_is_toplevel() was introduced as a replacement in gtk 2.18 => make that the minimum requirement. Change-Id: Ie5d2d8bd824af916a9764c66a7046f07a77b1748 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Use slogger2 for logging on Blackberry instead of writing to stderrFabian Bumberger2012-10-041-0/+34
| | | | | | | 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>
* QNX: change suffix for separate debug filesPeter Hartmann2012-10-011-1/+1
| | | | | | | | QNX uses .sym for files containing debug symbols. Change-Id: Ieb995ae90af771ff5c877213f4f4982169f333c6 Patch-by: Greg Bentz Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Blackberry mkspecs: Refine compiler optionsPeter Hartmann2012-10-011-2/+15
| | | | | | | | | | | | | | | | | | stack-protector-strong gives performance benefits over stack-protector-all and is still checking more than -stack-protector, so seems to be a good middle way and we want to use it when it is there. The -shared option for the compiler (not the linker) prevents a RIM internal version of qcc from forcing -fPIE, and should not harm in general when set. In addition, add a method "compilerSupportsFlag" for Windows as is present in the Unix configure script. Change-Id: Iba300e9cb82f34043e7b36f8e45287a1aed2a1a5 Original-patch-by: Greg Bentz Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* configure: Document the -widgets, -no-widgets argumentsKai Koehne2012-09-261-2/+6
| | | | | | | Also add -gui, since we're always documenting the default ones, too. Change-Id: I590af798d825f2933c6249663d4cad45fc23cb52 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 21:49:25 +0000