summaryrefslogtreecommitdiffstats
path: root/tools/configure
Commit message (Collapse)AuthorAgeFilesLines
* Fix configure warnings on Windows 7 with MSVC2010.Mitch Curtis2013-09-252-2/+2
| | | | | Change-Id: I5c4e27d6437cdf7b0dfd17df812d4506d1be4fb9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Disable sqlite for Windows Phone 8 buildsOliver Wolff2013-09-151-0/+2
| | | | | | | | | | | sqlite cannot be supported as Windows phone is missing the needed memory mapping functionality. Change-Id: I20e89292b9c7802c7402e8095854b72a9f21e614 Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
* build system support for WinRTOliver Wolff2013-09-141-5/+33
| | | | | | | | | Done-With: Andrew Knight Done-With: Oswald Buddenhagen Change-Id: Ief4e921072a03229bb342480a85024a1fc09fa56 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Merge branch 'stable' into devSergio Ahumada2013-09-133-8/+8
|\ | | | | | | | | | | | | | | Conflicts: src/concurrent/qtconcurrentmedian.h src/corelib/itemmodels/qabstractitemmodel.cpp Change-Id: Iac46a90bbb2958cef7670031a4b59c3becd8538a
| * fix configure -commercialJoerg Bornemann2013-09-113-8/+8
| | | | | | | | | | | | | | | | | | | | | | Commit 0aad3fc742a7aa15c21fe75e2b1b001f1f73468c broke "configure -commercial". The license check needs to know where Qt's source directory is. Change-Id: I5e53135b6b628eb5e413b2c2b3b8721dae02b503 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Kalle Viironen <kalle.viironen@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* | Add configure options for [experimental] HarfBuzz-NG supportKonstantin Ritt2013-08-271-0/+26
| | | | | | | | | | | | Change-Id: I15f49b56f49ae53c16db904e03f668c3135edaa5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Fix help output for freetype and PCRE in windows configure appKonstantin Ritt2013-08-271-2/+2
| | | | | | | | | | | | Change-Id: I686a63a02a5544736c84bcdbe274275acabfbc3d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Refactor line breaks in windows configure appKonstantin Ritt2013-08-271-6/+12
| | | | | | | | | | | | | | | | As a side effect, this fixes wrong line break in "Third Party Libraries" section. Change-Id: Ie6510fa94626a1c586621948a4681efdcf61f8b2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-215-32/+120
|\| | | | | | | | | | | | | | | | | Conflicts: qmake/doc/src/qmake-manual.qdoc src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/src.pro Change-Id: I0a560826c420e46988da3776bd8f9160c365459a
| * Integrate device-option into the windows configureBjoern Breitmeyer2013-08-153-27/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows configure does not have -device-option yet. A hack for android already generated the qdevice.pri. But it did this even if no android was build, so merged the device-option with the android generation of qdevice.pri. The qdevice.pri is generated earlier in the configure steps than before to match the linux configure and allow to set device options before the config.tests are run. Change-Id: I753cf0d5eba1479792a685d6e1f5acb38b970893 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * add configure -extprefix optionOswald Buddenhagen2013-08-152-2/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Don't compile qcryptographichash into configure.exeThiago Macieira2013-08-152-3/+0
| | | | | | | | | | | | | | It doesn't need it. Change-Id: I74a8b382fa77ba5bcdabd5b901742bec645ff0c8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | configure: Remove v8snapshot vestigesSergio Ahumada2013-08-201-9/+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-19/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | 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
| * purge QT_{SOURCE,BUILD}_TREE from dictionaryOswald Buddenhagen2013-08-121-8/+6
| | | | | | | | | | | | | | both variables are available class-wide anyway. Change-Id: I97c13de9ead44638e9310b62f02d8cd1c910df94 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * bye-bye .qmake.cacheOswald Buddenhagen2013-08-121-11/+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>
| * Configure: add -no-wmf-backend optionWouter Huysentruit2013-07-251-0/+14
| | | | | | | | | | | | | | | | | | | | This option is required to build qtmultimedia without Windows Media Foundation backend. In this case, a full DirectShow backend will be build instead. Change-Id: Ib29ba81ca6cbb00b609cc97fab7da29e61d31d6d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Sergio Ahumada2013-07-242-136/+92
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-232-136/+92
| |\| | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp Change-Id: I18a9d83fc14f4a9afdb1e40523ec51e3fa1d7754
| | * default to -compile-examplesOswald Buddenhagen2013-07-221-9/+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>
| | * don't change timestamp of unchanged filesOswald Buddenhagen2013-07-151-0/+6
| | | | | | | | | | | | | | | Change-Id: Ifa5c15a37d072c6c8edb50f8a4343d99ee0dccf9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * de-duplicate writeout of config filesOswald Buddenhagen2013-07-152-89/+90
| | | | | | | | | | | | | | | Change-Id: Iaad06f170cf2be3d3fca533a735b69316347ed5b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * prune unused filesDiffer() and writeToFile() functionsOswald Buddenhagen2013-07-152-44/+0
| | | | | | | | | | | | | | | Change-Id: I470a5b3514260a02e73389d057d89c64b08e05d0 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-113-2/+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
| * add support for Visual Studio 2013Joerg Bornemann2013-07-043-2/+11
| | | | | | | | | | | | | | | | | | | | Add mkspec win32-msvc2013 and make VS 2013 known to configure and qmake. Change-Id: I6e63a4d679727a8a3f068f377956185996d72bce Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Disable xkbcommon when building for QNX from WindowsMatt Fischer2013-07-021-0/+1
| | | | | | | | | | | | | | | | | | | | A previous commit (7582bb5) added a line to disable xkbcommon when building for Android. A similar line needs to be added to handle QNX builds. Change-Id: I34e91d989567b17e7e21b87d9c377360e4e56f68 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-271-8/+13
|\| | | | | | | | | | | | | | | Conflicts: configure mkspecs/features/create_cmake.prf Change-Id: I94aea83b83833395d5db399209e0e51b92ef23b5
| * introduce "secret" configure -top-level optionOswald Buddenhagen2013-06-261-2/+13
| | | | | | | | | | | | | | | | | | | | 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>
| * remove pointless qmake -o argumentOswald Buddenhagen2013-06-261-2/+0
| | | | | | | | | | | | | | | | it's already done by the working directory. the unix configure already did it that way. Change-Id: Ia88d0877a2e24bc40a7083c2164982dec47f913b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * simplify qmake callOswald Buddenhagen2013-06-261-1/+1
| | | | | | | | | | | | | | | | the directory is sufficient nowadays. the unix configure already did it that way. Change-Id: I887e5ad594aef1f7bf5f4f92a6bdf0a13e4d0372 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * remove pointless variablesOswald Buddenhagen2013-06-261-5/+1
| | | | | | | | | | Change-Id: Ia4cd2292bdea49c198ee1429ab4d3f87697c3ed1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-202-10/+17
|\| | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp tools/configure/configureapp.cpp Change-Id: I3092bd3276af14304b7ab3ae1e1cc05d11cdede0
| * complain about bad arguments to -make/-nomakeOswald Buddenhagen2013-06-192-2/+15
| | | | | | | | | | | | Task-number: QTBUG-5366 Change-Id: I461a6c85fcee4a0216571d294171652b05ee6a34 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * don't try to not build non-existing partsOswald Buddenhagen2013-06-171-2/+2
| | | | | | | | | | Change-Id: I20896f15f7ab91aac8a9b6977fd3a253bc0e187d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * don't claim that we need perl for shadow builds any moreOswald Buddenhagen2013-06-121-6/+0
| | | | | | | | | | | | | | amends 0a1b89bff, which took care only of the unix version. Change-Id: Idb82881a9c47e67c973500721fd499bcf41a848b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-06-131-4/+39
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-121-4/+39
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/cocoa/qcocoamenubar.mm Change-Id: I4a699fc8a7f30b2af9de8e496c3d5f027b7495bb
| | * Only process vcproj files if we do a -fully-processOswald Buddenhagen2013-06-031-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A top-level vcproj (really a .sln file) only makes sense when sub- projects are generated too, since the solutions generator will ignore all non-generated projects. Originally-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Change-Id: Iff09279d5760b5114a4cfb9b58ad677f2f69fa58 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * run syncqt only for builds from gitOswald Buddenhagen2013-06-031-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-8/+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-6/+3
|/ / | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-041-0/+20
|\| | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/plugins/platforms/cocoa/qnsview.mm Change-Id: I6fe345df5c417cb7a55a3f91285d9b47a22c04fa
| * add -compile-examples configure optionOswald Buddenhagen2013-05-261-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-05-233-148/+62
|\| | | | | | | | | | | | | | | | | | | | | 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
| * Android: Disable xkbcommon in configure.exeRay Donnelly2013-05-231-0/+4
| | | | | | | | | | | | | | Task-number: QTBUG-31220 Change-Id: I711fa5d37cb58216199cc0ce479a14a3300d8cb8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * move detectArch() call right after autoDetection()Oswald Buddenhagen2013-05-221-4/+7
| | | | | | | | | | | | | | | | | | | | it belongs there (technically, it would not hurt to actually call it from within autoDetection()). Task-number: QTBUG-31095 Change-Id: I7eb53762513eb9cebfd22317c8f44fe123eb91dd Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| * reality adjustment: rename generateSystemVars() => prepareConfigTests()Oswald Buddenhagen2013-05-223-3/+3
| | | | | | | | | | Change-Id: I3f9cd8b8cdb54d682d0207f28168f4e518b98280 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * purge dead output-related codeOswald Buddenhagen2013-05-221-12/+0
| | | | | | | | | | | | | | QTBUILDINSTRUCTION is not evaluated anywhere anymore. Change-Id: Ie23f61f5a25594591efdafdc49e279f13623b049 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 02:11:11 +0000