summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* iOS: Skip qtserialport moduleSergio Ahumada2013-09-031-1/+1
| | | | | | | This module doesn't build for iOS yet Change-Id: I625b27a39637c0b816a9136d3eabfe2c0073f108 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-271-1/+1
|\ | | | | | | | | | | | | Conflicts: examples/widgets/doc/src/addressbook-fr.qdoc Change-Id: Id1196e8e0c6445f1616c3f29234c974d809f8e48
| * Android: Set default to gcc 4.8BogDan Vatra2013-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | The 4.7 version of the toolchain in the NDK has been obsoleted by the introduction of version 4.8. The default can still be overridden if necessary. Change-Id: I042ded92e50dc5ebc4d54ffccc2e6856fc3edba0 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Add configure options for [experimental] HarfBuzz-NG supportKonstantin Ritt2013-08-271-8/+32
| | | | | | | | | | | | Change-Id: I15f49b56f49ae53c16db904e03f668c3135edaa5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Add freetype result info to unix configure outputKonstantin Ritt2013-08-271-0/+1
| | | | | | | | | | | | | | Change-Id: I0393a593a721ec0cd7e7a2490e0fe0453f092934 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 "Merge remote-tracking branch 'origin/stable' into dev" into ↵Thiago Macieira2013-08-221-2/+78
|\ \ | | | | | | | | | refs/staging/dev
| * \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-211-2/+78
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/doc/src/qmake-manual.qdoc src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/src.pro Change-Id: I0a560826c420e46988da3776bd8f9160c365459a
| | * add configure -extprefix optionOswald Buddenhagen2013-08-151-2/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this adds the possibility to put the actual qt installation outside the sysroot it is configured for. this makes it possible to install an x-built qt without "polluting" the sysroot, which makes it possible to have read-only sysroots, and multiple qt builds for one sysroot. -prefix is the location within the sysroot as seen by the target itself, and gets "burned" into QLibraryInfo in QtCore. -extprefix is the location in the host file system and gets "burned" into QLibraryInfo in qmake. if it is not specified, it defaults to the sysrootified prefix, which is the previous behavior. Task-number: QTBUG-26680 Change-Id: Ia43833c4e27733159afeb8c8b9b2d981378d0cd1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | configure: Abort if Xlib isn't present when building for XCB.Nicolás Alvarez2013-08-211-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | The XCB port is still incomplete and needs Xlib in several places. The configure script should reflect that and make sure Xlib is present. Change-Id: I6d81ea6cacef56084cf7ccfbcf908d597aae918f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | configure: Check for Xrender only when building for XCB.Nicolás Alvarez2013-08-211-18/+18
|/ / | | | | | | | | | | | | The XCB platform plugin is the only one that requires Xrender. Change-Id: Iac2efa31b4b51e38305ee5f635fe38b75c7752de Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | configure: Remove v8snapshot vestigesSergio Ahumada2013-08-201-29/+0
| | | | | | | | | | | | | | Change-Id: I0a43320ca0ab7cc416b07396ebc795215d84fe10 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-141-23/+13
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/macx-xcode/Info.plist.app mkspecs/macx-xcode/Info.plist.lib qmake/doc/qmake.qdocconf src/corelib/global/qglobal.h tests/auto/other/exceptionsafety/exceptionsafety.pro tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp Change-Id: I3c769a4a82dc2e99a12c69123fbf17613fd2ac2a
| * bye-bye .qmake.cacheOswald Buddenhagen2013-08-121-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | well, not really - qt_parts.prf will still create one, but it will be empty. apart from being cleaner, this now finally makes it possible to load an unconfigured qt source tree into qtcreator without random parts of the tree being missing from the project explorer. Change-Id: Ida7ee77ecb450af05bfa66106caf2067b02f1a7f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * reject unrecognized -no-l* optionsOswald Buddenhagen2013-08-051-3/+11
| | | | | | | | | | | | | | | | | | | | the -l* fallback is for adding libraries. it obviously makes no sense in its negated form. Task-number: QTBUG-32550 Change-Id: I9f3af9a2fc059ba39987d4b197ed4778cc7f35b6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * configure: Fix xkbcommon summary outputSergio Ahumada2013-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | On systems where xkbcommon >= 0.2.0 the output should be xkbcommon .............. yes (system library) instead of xkbcommon .............. yes Change-Id: I5807946e61814d414a68a15ad96c91f25c9482ee Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * configure: Fix qtwebkit-examples-and-demos -> qtwebkit-examplesSergio Ahumada2013-07-311-1/+1
| | | | | | | | | | Change-Id: I950912a883c263ee4bbae4d1da53c66aa870be70 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Integrate gcov support into Qt build system.Sergio Ahumada2013-08-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | To instrument a Qt application or library with the gcov coverage tool, do `CONFIG+=gcov' in the application .pro file. To instrument Qt itself with gcov, use the `-gcov' configure option. Change-Id: If24e91d95318609b0df1a76ed6d679bd92bcaab2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Remove hard-coded disabling of qtdeclarative on iOSSimon Hausmann2013-07-311-1/+1
| | | | | | | | | | | | | | | | Instead the module decides now itself whether it supports iOS or not, because soon it will enable itself :) Change-Id: I4802441f0a01ed62966a7a0e66f5a8ccfe843cb8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Fix warning in configure about not using 'macx-xcode' for Qt itselfTor Arne Vestbø2013-07-301-3/+3
| | | | | | | | | | | | Change-Id: I08f68813ac99f071b6f59a332c99afd75d3de41c Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Sergio Ahumada2013-07-241-10/+2
|\ \ | | | | | | | | | refs/staging/dev
| * \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-231-10/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp Change-Id: I18a9d83fc14f4a9afdb1e40523ec51e3fa1d7754
| | * default to -compile-examplesOswald Buddenhagen2013-07-221-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because of popular confusion. the packaging scripts now need to use -no-compile-examples explicitly. Task-number: QTBUG-32449 Change-Id: Iecab1f345afe21e540204fe69a2292ef932cbb61 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | set QT_TARGET_ARCH when building for the hostOswald Buddenhagen2013-07-231-0/+1
|/ / | | | | | | | | | | | | | | | | the built host tool may need to know what the target architecture is, e.g. mkv8snapshot does. Change-Id: Ie5b1f6a07fa082d212e7c5b54289de49fd74dbcf Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge branch 'stable' into devSergio Ahumada2013-07-111-8/+12
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: qmake/generators/mac/pbuilder_pbx.cpp src/corelib/json/qjsonwriter.cpp src/corelib/kernel/qeventdispatcher_blackberry.cpp src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm Change-Id: I24df576c4cbd18fa51b03122f71e32bb83b9028f
| * Don't enable EGL support if OpenGL is disabled.Thiago Macieira2013-07-031-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtPlatformSupport fails to build if EGL support is enabled but OpenGL isn't. It tries to compile eglconvenience, but qplatformopenglcontext.h is empty (#ifndef QT_NO_OPENGL). It makes no sense to have EGL with no OpenGL ES, so make sure we don't try it. The current test to disable EGL if OpenGL desktop is active is upside down. With -opengl desktop -no-egl, it would complain that EGL support was requested. Task-number: QTBUG-28763 Change-Id: I80c780ec78181f3fa85f43e41be21d1217d76610 Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-271-5/+19
|\ \ | |/ | | | | | | | | | | | | Conflicts: configure mkspecs/features/create_cmake.prf Change-Id: I94aea83b83833395d5db399209e0e51b92ef23b5
| * configure: Use $AWK instead of plain 'awk'Sergio Ahumada2013-06-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The $AWK variable already contains the best awk version available. Possible values for this variable are: gawk, nawk or awk. Using just awk fails on Solaris with: user@localhost:~/qtbase$ ./configure -platform solaris-g++ awk: syntax error near line 4 awk: bailing out near line 4 This is the Qt Open Source Edition. Change-Id: I02a17915e8b27a5ce7e831a1225872cf460b3a6b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * configure: Don't use 'local' in report_support()Sergio Ahumada2013-06-261-2/+0
| | | | | | | | | | | | | | | | The 'local' keyword doesn't exist in Solaris' bourne shell as a reserved word. Change-Id: I3270c74f79842ee10481a40a9f82d9fb74aff2e5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * introduce "secret" configure -top-level optionOswald Buddenhagen2013-06-261-2/+18
| | | | | | | | | | | | | | | | | | | | shifts the makefile generation one directory level up. this allows the top-level configure to leave the makefile creation entirely to the qtbase configure. this is not very clean modularization-wise, but consistent with -skip. Change-Id: I7ee2d2f29f2e6619d61fe9b55faa0bacdf3c44c1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-201-11/+56
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp tools/configure/configureapp.cpp Change-Id: I3092bd3276af14304b7ab3ae1e1cc05d11cdede0
| * catch accidental use of -no-makeOswald Buddenhagen2013-06-191-4/+8
| | | | | | | | | | | | | | | | the option the user most likely meant is called -nomake. Task-number: QTBUG-21778 Change-Id: I6d8c4d5a984c929804f49ffc2ac75f6945f76e81 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * complain about bad arguments to -make/-nomakeOswald Buddenhagen2013-06-191-0/+9
| | | | | | | | | | | | Task-number: QTBUG-5366 Change-Id: I461a6c85fcee4a0216571d294171652b05ee6a34 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * don't claim that "make install" is needed for non-prefix shadow buildsOswald Buddenhagen2013-06-171-1/+1
| | | | | | | | | | | | Change-Id: I3a72fa8f5f849fba1a4bc79788b090c1a23b0198 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * normalize file list assignmentsOswald Buddenhagen2013-06-171-2/+2
| | | | | | | | | | | | | | | | | | | | not quoting the variable references allows the shell to word-split the contents and thus convert the embedded linebreaks into spaces. Change-Id: Id834f02d7a501fb6fe48b45f409f599a8b70b7ed Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Ray Donnelly <mingw.android@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * don't write unused QT_INSTALL_* to qmake MakefilesOswald Buddenhagen2013-06-171-6/+0
| | | | | | | | | | | | | | | | | | the installation has been moved to the qtbase top-level project a long time ago. Change-Id: I25f1658d1a6544da4bdaa5be6b19f9076c19b7f9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * wrap the horrendeous monster switch caseOswald Buddenhagen2013-06-171-1/+39
| | | | | | | | | | | | Change-Id: Ia8619a9e75006d9a95ae325de7aa326b5dd928a6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-06-131-14/+31
|\ \ | | | | | | | | | refs/staging/dev
| * \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-121-14/+31
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/cocoa/qcocoamenubar.mm Change-Id: I4a699fc8a7f30b2af9de8e496c3d5f027b7495bb
| | * don't make qconfig.h read-onlyOswald Buddenhagen2013-06-121-3/+1
| | | | | | | | | | | | | | | | | | | | | not much point in it, really. Change-Id: If984aa137993ae6b95cb3591fceac729ae3aa819 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * remove pointless symlink fallback for qconfig.hOswald Buddenhagen2013-06-051-3/+0
| | | | | | | | | | | | | | | | | | | | | syncqt does that nowadays. Change-Id: Iffc465cce86a7c6370afaa543ba9b9ed8d478eea Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * run syncqt only for builds from gitOswald Buddenhagen2013-06-031-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the logic in the configures was even trying to express that, only that nowadays we always ship syncqt, so the tests were kinda pointless. this frees us from the perl dependency for non-developer builds of packaged modules (except for webkit, which needs almost every scripting language on earth anyway). obviously, this requires that the packaging scripts run syncqt in the source dir before tarring up the sources. note that for repositories other than qtbase, the -version argument needs to be passed to syncqt. Task-number: QTBUG-29465 Change-Id: Ic929ab17a5de4b30fbf48b3aa9bfa3b4d2ef37d6 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * let configure create the forwarding qconfig.h againOswald Buddenhagen2013-06-031-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this avoids that syncqt needs to forward to a yet unexisting file (which will have a yet unknown location, when syncqt is run at packaging time already). the %inject_headers syncqt config variable remains, so it can be told not to purge "foreign" files. Change-Id: I127ff6e0b7d5702fb0acaee9a5b7940b482d3608 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | don't copy/symlink doc/global to build dirOswald Buddenhagen2013-06-121-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | instead, use the files directly from the source dir. Change-Id: I03b728c66de6e03cade6dc153dcc78cea8e3f606 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | don't copy mkspecs to build directoryOswald Buddenhagen2013-06-121-36/+6
|/ / | | | | | | | | | | | | 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>
* | Update the code detecting the default include and library pathsThiago Macieira2013-06-071-16/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it be one big AWK script instead of a ton of smaller processes. Also handle the defaults inside the AWK script for simplicity. Since the output is a qmake variable, we do not need to surround with quotes strings that don't contain spaces. Also, use a tee trick to print the verbose output: we get the actual output from awk. Change-Id: I4a48a917c988a6b03d2c3b6990765301287713ef Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-041-13/+26
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/plugins/platforms/cocoa/qnsview.mm Change-Id: I6fe345df5c417cb7a55a3f91285d9b47a22c04fa
| * remove bizarre perl detection magicOswald Buddenhagen2013-05-301-6/+0
| | | | | | | | | | | | | | | | | | | | the code makes no sense, and was added with the QNX port without comment. there is already a detection a few lines up. Change-Id: I18ec18604c37c7c42f2649a658dd22324d481dd3 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
| * add -compile-examples configure optionOswald Buddenhagen2013-05-261-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this overrides the magic that makes examples only install their sources in production builds. packagers may want to force the build of the examples, so they can package them up for demo purposes. this is actually why we formerly had the split between demos and examples ... Task-number: QTBUG-30788 Change-Id: I5633f69404c5aa6846f5496e8f161a273a7a7da3 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Android: detect Linux 64 bit host architecturePaul Olav Tvete2013-05-241-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | This is the easy fix: looking at what is supported by the NDK. If people have weird setups, then they have to specify -android-ndk-host. We do actually detect the host architecture later, but using that would be a much bigger (and riskier) change. Task-number: QTBUG-31275 Change-Id: I18db878031baa2e1ee2fa4beff364d58d8bd3c7a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-05-231-162/+197
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qdatastream.cpp src/corelib/io/qdatastream.h src/corelib/json/qjsonwriter.cpp src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbkeyboard.cpp Change-Id: I46fef1455f5a9f2ce1ec394a3c65881093c51b62