summaryrefslogtreecommitdiffstats
path: root/tools/configure
Commit message (Collapse)AuthorAgeFilesLines
* do not embed manifests into Qt plugins by defaultJoerg Bornemann2013-11-261-1/+1
| | | | | | | | | | | | | | For plugins that are built with a different (but binary compatible) MSVC runtime than Qt is built with, the plugin's embedded manifests prevent a successful loading of the plugin. There's no need for having the plugins tied to a certain CRT version as they are bound to Qt's CRT version. Task-number: QTBUG-1297 Change-Id: I6ae4cadd99ee4657e613b07a40141a7bae08424f Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Add PPS configure checkAndreas Holzammer2013-11-231-1/+21
| | | | | | | | | | | Plain QNX 6.5.0 does not have a libpps, the new QNX has a libpps and BlackBerry has it as well. So we need a configure check to not open another mkspec for this platform. This fixes the plain QNX 6.5.0 build. Change-Id: Id4b3876f2385bcb5f3df426945532e7e26133f24 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* don't automatically display help on errorOswald Buddenhagen2013-11-201-9/+9
| | | | | | | | | | | it's entirely pointless to flood the user with information and force him to scroll back when he most likely just made a typo. apart from that, this reduces the data dependencies, thus easing further refactoring. Change-Id: I7b24274d453de54a4f02481a66d77e27d4ab0657 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Use compile check instead of searching header for ICUAndreas Holzammer2013-11-141-1/+1
| | | | | | | | | | | | | | The findFile would need to look though all include paths the compiler is supporting, which can be very hard to support for multiply compilers. It is way easier to use a compile check to catch all include paths the compiler supports. This fix is needed to find correctly ICU under QNX. Task-number: QTBUG-34743 Change-Id: I4f755042a76882b304b058355cf54e37b25df61d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Autodetect Fontconfig for QNXAndreas Holzammer2013-11-141-0/+8
| | | | | | | | Task-number: QTBUG-34743 Change-Id: Ib9bba874137b1ef081cb7e8450746abbe983ebc9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Autodetect Neon support under WindowsAndreas Holzammer2013-11-141-1/+5
| | | | | | | | | | | This is done to autodetect Neon support for QNX. It might make sense for other platforms as well, so enable the compile check for all target platforms. Task-number: QTBUG-34743 Change-Id: I1d149d1942ce0caa288cb56491e4a0ba455dda7d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Detect architecture before auto detectionAndreas Holzammer2013-11-142-3/+3
| | | | | | | | | | | | | Some compile checks may depend on the architecture, e.g., NEON is only available for ARM, so it makes no sense to check it for this architecture. Therefore we need to run the architecture check before we auto detect settings. Task-number: QTBUG-34743 Change-Id: I53208d25b0ae0fd93cccc7394307b8ee286576a2 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* CMake: Add the qreal typedef type to the Qt5::Core target.Stephen Kelly2013-11-041-0/+1
| | | | | | | | | | This way, a Qt compiled with qreal=float and one linked with qreal=double can not be linked by a single downstream. That is diagnosed at cmake-time. Change-Id: I9183dbcfef181fadea5321d3154948e8258e4a2a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Don't build ANGLE while xcompile for QNXAndreas Holzammer2013-11-011-0/+1
| | | | | | Change-Id: Iacc0f4bb776943b21a94b52417a77112facad20f Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* make qreal double by default on all platformsLars Knoll2013-10-311-0/+12
| | | | | | | | | | | | | | On modern ARM CPUs there is no speed difference between float and double anymore, so let's rather use double for qreal to avoid rounding and precision issues. Like this we also get much better compatibility with our desktop OSes. This is not binary compatible on ARM, but the old behavior can be restored by passing -qreal float to configure. Change-Id: I2a4b61e19a3dfa6b0bd76734cecf2634c97207fc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* bring the windows configure -qconfig handling in line with the unix oneOswald Buddenhagen2013-10-302-54/+16
| | | | | | | | on the way, this significantly simplifies the code. Change-Id: I24f0a517e62cc4b913ffef5cab096e721653c013 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* validate qconfig-*.h against qfeatures.txtOswald Buddenhagen2013-10-291-0/+5
| | | | | Change-Id: I59b7e30cfaa2b1bf2c5d4a3e04b5169f3c9439b5 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Rewrite qmake's exclusive-build featureTor Arne Vestbø2013-10-251-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to compute the default exclusive build directory, eg 'debug', at configure time, and then set OBJECTS_DIR, MOC_DIR, etc to include this hard-coded default exclusive build directory. We then had to run a post- process step where we replaced the 'debug' part with the current actual exclusive build pass, eg 'release', resulting in long-standing bugs such as QTBUG-491 where we end up replacing parts of the build output dirs that were not part of the original exclusive build directory. We now set the OBJECTS_DIR, MOC_DIR, etc defaults in configure like before, but they do not include any exclusive-build information. The exclusive build directory is handled as a separate step in default_post where we adjust all entries in QMAKE_DIR_REPLACE to be exclusive directories. For backwards compatibility the new exclusive build behavior is only enabled for variables named by QMAKE_DIR_REPLACE_SANE, which for Qt itself applies globally to everything but DESTDIR, and for libs and tools also applies to DESTDIR. The reason for leaving out DESTDIR in the general case is because many tests and examples assume the old behavior for DESTDIR. A side effect of including all the other variables for Qt libs and tools is that the PCH output dir will be uniformly set, which has been an issue on Windows in the past. The addExclusiveBuilds function now takes two or more arguments, each argument being the key for an exclusive build, which can be customized eg. using $$key.{name,target,dir_affix}. Passing more than two arguments results in three/four/etc-way exclusive builds, eg debug/release/profile. Exclusive builds can also be combined, eg static/shared + debug/release by making two calls to the function. We also handle individual targets of combined exclusive builds, eg static/shared + debug/release, meaning it is possible to run 'make debug' to build both static-debug and shared-debug. Task-number: QTBUG-491 Change-Id: I02841dbbd065ac07d413dfb45cfcfe4c013674ac Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix check for ICU on MinGWKai Koehne2013-10-241-3/+1
| | | | | | | | | | | | Newer ICU versions do not generate a .lib file any more ... Also the check doesn't take e.g. static debug builds into account. Instead of trying to enumerate all possible variations, just rely on the header check. That's what we're doing for the other libs, too. Change-Id: Idc0527f0e8ad90f298337d4ab635c7aa6a35c351 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Detect pointer size at configure-time on Windows-hosted buildsMatt Hoosier2013-10-221-0/+7
| | | | | | | | | | | | | | | | | | The configure-time procedure used on Windows does not currently perform the same tests to determine the width of a pointer as are performed on Unix-based builds. This causes QT_POINTER_SIZE to be undefined in the generated qconfig.h file. This in turn breaks compilation of various Qt modules such as QtDeclarative. This patch adds the same level of support for automatically determining the target platform's pointer size, as is currently offered to Unix users. Change-Id: I93838c1759b14089ba9f4daf442048fb5c8da738 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Android: Default to toolchain version 4.8 on Windows as wellEskil Abrahamsen Blomfeldt2013-10-071-1/+1
| | | | | | | | | The default has already been changed in the configure shell script, but configure.exe needs the same change to be compatible with the current NDK (which no longer contains the 4.7 toolchain) Change-Id: Icd6474c3c9b9bbefbba5a1273a466c7ff099b7e0 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Disable JavaScriptCore JIT for Android when building on WindowsEskil Abrahamsen Blomfeldt2013-10-041-0/+7
| | | | | | | | | | | | | | On Linux, we will do a configure test to determine whether JIT should be turned off when compiling JavaScriptCore in the QtScript module, but this test is never run on Windows. The result was that JIT was disabled on Linux and enabled on Windows, and compilation broke on Windows. Task-number: QTBUG-33780 Change-Id: I37991c6da98b35330c07c54f2a0b143d20780c91 Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* 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