summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* iOS: Enable fat builds containing both armv7 and arm64 slicesTor Arne Vestbø2014-11-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Apple will from February 1, 2015, require all applications uploaded to the App Store to be built for both 32-bit (armv7/s) and 64-bit (arm64). https://developer.apple.com/news/?id=10202014a We enable fat Qt binaries by passing both -arch armv7 and -arch arm64 to clang, which takes care of lipoing together the two slices for each object file. This unfortunately means twice the build time and twice the binary size for our libraries. Since precompiled headers are architecture specific, and the -Xarch option can't be used with -include-pch, we need to disable precompiled headers globally. This can be improved in the future by switching to pretokenized headers (http://clang.llvm.org/docs/PTHInternals.html). Since we're enabling 64-bit ARM builds, we're also switching the simulator builds from i386 to fat i386 and x86_64 builds, so that we are able to test 64-bit builds using the simulator, but we're keeping i386 as the architecture Qt is aware of when it's building for simulator, as we need the CPU features to match the lowest common denominator. Change-Id: I277e60bddae549d24ca3c6301d842405180aded6 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Build Qt for OS X and iOS with relative rpathAdam Strzelecki2014-11-011-5/+1
| | | | | | | | | | | | | | | | | Defaulting to absolute_library_soname on configure -rpath is no longer necessary as now we support @rpath install name ids on OS X and iOS. This also sets QMAKE_SONAME_PREFIX to @rpath for Qt modules when built with rpath configuration. This makes Qt libraries relocatable on OS X. Qt SDK is not yet relocatable though, because plugin location (including cocoa plugin) is still resolved using absolute path (see QTBUG-14150), also there are several absolute paths hardcoded in qmake mkspecs pri files. Task-number: QTBUG-31814 Change-Id: Ie9dffefcd2a946c1580293d433621c1adb7e06c4 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Use :- instead of - for empty environment variablesThiago Macieira2014-10-101-3/+3
| | | | | | | | We set the variables to empty when we start processing, so ${FOO-foo} will never print "foo". We need to use ${FOO:-foo}. Change-Id: I00c28edb10d8eaa09df689905a302b576b246806 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Allow using pkg-config on OS X/iOS using explicit -pkg-config to configureTor Arne Vestbø2014-10-061-1/+1
| | | | | | | | Fixup after d44781730ccd4d4, which would override whatever the user passed on the command line. Change-Id: If4d260801866ff53de3e6dfd6d37016fd8453d8d Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Android: Don't include Apache code under LGPLv2 licenseEskil Abrahamsen Blomfeldt2014-10-021-7/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | The code which extracts style assets for the Android style is licensed under the Apache license, which is not compatible with LGPLv2.1. It is, however, compatible with LGPLv3. This means that the Android platform plugin cannot be LGPLv2.1 as long as this code is included. To minimize licensing confusion, we default to only providing LGPLv3 for Android. If you want to build a LGPLv2.1-compatible library, you can add -no-android-style-assets to the configuration. This will in turn enable the LGPLv2.1 in the configure output, and it will disable the extraction code in the platform plugin. Running the Android style with an LGPLv2.1-compatible platform plugin will work, but it will look horrible. [ChangeLog][Android] Default open-source license for Qt for Android is now LGPLv3. For compatibility with the LGPLv2.1 license, add "-no-android-style-assets" to your configuration. Change-Id: I6c7b52140f38138520871fa7c69debbb4ee90e6c Task-number: QTBUG-41365 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Remove existence test for LICENSE.LGPL3Eskil Abrahamsen Blomfeldt2014-10-021-7/+3
| | | | | | | | This license file has to exist, since much of the code is licensed under LGPLv3. Change-Id: I2795a7cc62f6de65a35921e38d2ab5f8f0233f71 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* configure: Disable pkg-config on OS X unless explicitly requestedTor Arne Vestbø2014-10-011-3/+6
| | | | | | | | | | We don't have an explicit XPLATFORM_OSX, but XPLATFORM_MAC applies to both OS X and iOS (as now clarified), so we move the default out of the XPLATFORM_IOS scope and to a XPLATFORM_MAC scope. Change-Id: I6b9ba9c881c28def08b9ab863d0165fbd9dedc6d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Update license headers and add new license filesMatti Paaso2014-09-241-26/+18
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 - Removed LICENSE.GPL Change-Id: Iec3406e3eb3f133be549092015cefe33d259a3f2 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4Frederik Gladhorn2014-09-241-1/+1
|\
| * Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-09-231-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The isAlwaysAskOption was removed in 38621713150b663355ebeb799a5a50d8e39a3c38 so manually removed code in src/plugins/bearer/connman/qconnmanengine.cpp Conflicts: src/corelib/global/qglobal.h src/corelib/tools/qcollator_macx.cpp src/corelib/tools/qstring.cpp src/gui/kernel/qwindow.cpp src/gui/kernel/qwindow_p.h src/gui/text/qtextengine.cpp src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig_p.h src/plugins/platforms/android/qandroidinputcontext.cpp src/plugins/platforms/xcb/qglxintegration.cpp src/plugins/platforms/xcb/qglxintegration.h src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/testlib/qtestcase.cpp src/testlib/qtestlog.cpp src/widgets/dialogs/qfiledialog.cpp src/widgets/kernel/qwindowcontainer.cpp tests/auto/corelib/tools/qcollator/tst_qcollator.cpp tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp Change-Id: Ic5d4187f682257a17509f6cd28d2836c6cfe2fc8
| | * configure: fix expanding system commands in qmake parser with GNU awk < 4Olivier Blin2014-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmake variables using $$system() were incorrectly parsed by the custom qmake parser in the configure script, when using GNU awk 3.1.8 or earlier. They are parsed correctly with GNU awk 4 or mawk. This was occurring with such an assignement (from an extra mkspecs file): QMAKE_CC = $$system($$CMD QMAKE_CC 2>/dev/null) The custom qmake parser in the configure script first attempts to expand $$UPPERCASE variables, before running $$system(), using this: match(value, /\$\$(\{[_A-Z0-9.]+\}|[_A-Z0-9.]+)/) But when using non-ASCII locales with GNU awk 3.1.8 or earlier, $$system was expanded (to an empty string) because these earlier awk versions match lowercase letters for the [A-Z] regexp, which is traditionally used to match uppercase letters. This behavior has been changed in GNU awk 4.0.0, which only matches uppercase letters for [A-Z] by default. A workaround for earlier GNU awk versions is to run awk with the C locale. See GNU awk NEWS "Changes from 3.1.8 to 4.0.0": 25. Gawk now treats ranges of the form [d-h] as if they were in the C locale, no matter what kind of regexp is being used, and even if --posix. The latest POSIX standard allows this, and the documentation has been updated. Maybe this will stop all the questions about [a-z] matching uppercase letters. THIS CHANGES BEHAVIOR!!!! See also gawk.info "A.7 Regexp Ranges and Locales: A Long Sad Story" Change-Id: Ibb3eb28738c3e77d496c634e1f5c9f630957e730 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Fix the number of empty lines between warnings at the end of configureThiago Macieira2014-09-231-2/+2
|/ / | | | | | | | | Change-Id: I9b3e64477331cb7257228b4bf05f9ebb82227009 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Fix bash syntax error in configureAdam Strzelecki2014-09-021-1/+1
| | | | | | | | | | | | | | Fixes missing space before `]` in test condition introduced in 8d5772533887266d. Change-Id: I741c291677f32056a0a0bec12cb4d9fd293a2021 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Add a note to the configure about the use of journald and slog2Thiago Macieira2014-08-301-0/+7
| | | | | | | | | | Change-Id: I790807d286fc89f6cca890342d15d0ed044163a5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Make HarfBuzz-NG the default shaper on all platformsKonstantin Ritt2014-08-201-17/+22
| | | | | | | | | | | | | | | | | | | | [ChangeLog][Important Behavior Changes] HarfBuzz-NG is now the default shaper on all platforms. This results in a better shaping results for various languages, better performance, and lower memory consumption. Task-number: QTBUG-18980 Change-Id: I4d9454fc37e9050873df3857e52369dfc7f191b2 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | Update the handling of the -xkbcommon configure optionThiago Macieira2014-08-091-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | If the user requested the system xkbcommon with -system-xkbcommon, then don't silently fall back to the bundled version if the functionality test fails. Instead, print the an error notice. Also note that the -xkbcommon argument didn't do anything, since it set the variable to "yes". Change-Id: I2c9e820bd076995aaaad987ecce76ebddcd79b4a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Remove specific maemo/meego codepathsAllan Sandfeld Jensen2014-08-061-4/+0
| | | | | | | | | | | | | | | | | | We no longer support the maemo/meego platform, so we can remove the specific code for that platform. Change-Id: Ia7f0730eba2d96794b97b7ca4753f63a2d7bc2a8 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | Remove the last remnants of iWMMXt in QtThiago Macieira2014-08-051-17/+1
| | | | | | | | | | | | | | | | This code hasn't been tested for at least 4 years. It's not maintained and probably doesn't work. Change-Id: I4b9a5179e34111b400914f91caa6b741b69771bb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-291-1/+9
|\| | | | | | | | | | | | | Conflicts: src/network/ssl/qsslsocket_openssl_symbols.cpp Change-Id: Ic62419fa1fee5f4de6c372459d72e6e16f9a810b
| * Improve dbus cross compilationBernd Weimer2014-07-281-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Building QtDBus on Linux host for QNX target had two issues: * Configure check failed, because dbus-1 library was not linked in, if target platform doesn't support pkg-config. * Host tools were not built, because pkg-config was not used to locate dbus headers on the host. Task-number: QTBUG-37324 Change-Id: I71d8309599fd40ef2dd8c9e3b44b93a7482019f1 Reviewed-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Restore Neon "detection" in QtThiago Macieira2014-07-251-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't actually detect whether the compiler can create Neon code or provides Neon intrinsics. Most of them do, so that test would be mostly moot. We removed the detection previously because we couldn't automatically enable Neon due to leakage of instructions outside the areas protected at runtime. Instead, we rely on the mkspec properly passing the necessary flags that enable Neon support. This commit does not change that. All it does is verify whether the arch detection found "neon" as part of the target CPU features. In other words, it moves the test that was in simd.prf to configure. It does fix the Neon detection in configure.exe, which was always failing for trying to run a test that didn't exist (config.tests/unix/neon). Change-Id: Id561dfb2db7d3dca7b8c29afef63181693bdc0aa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Introduce qmake feature use_gold_linkerAllan Sandfeld Jensen2014-07-231-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the feature use_gold_linker to use the gold linker that has been part of of GNU binutils since 2008. Gold links C++ libraries much faster and use less memory. The feature is autodetected when building Qt on Linux, but can be disabled in configure. On MingW builds it is default off but can be enabled for cross builds. Change-Id: Icdd6ba2e706b2c791bcf44b6e718c2b7a5eb2218 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Canonicalize inputs when filtering default system pathsMichael Palimaka2014-07-151-0/+1
| | | | | | | | | | | | | | | | | | | | Contrary to expectations, various <foo>-config tools sometimes spit out denormalized paths, which breaks the text-based filtering, as it relies on exact matches with normalized paths. Change-Id: I0613ed24953a3bde19939d28d09572c88b43a361 Task-number: QTBUG-39216 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | make qmake failure fail configureOswald Buddenhagen2014-07-071-1/+1
| | | | | | | | | | | | | | the windows version is already sane in this regard Change-Id: Ib9c6fa35ede0e5e98b38b7b97086b9245c79d48f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | nuke -process/-fully-process/-dont-process optionsOswald Buddenhagen2014-07-071-23/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][configure] The -process/-fully-process/-dont-process options have been removed due to being unnecessary and counterproductive. -fully-process has always been broken to a degree under unix (and since 5.0 under windows) - rcc isn't built before running qmake -r, so the dependencies are unreliable (and there are many warning messages from qmake). also, it is a lot slower nowadays, as qmake -r is not parallelized. -dont-process doesn't make any sense any more - even if you don't need the Makefile for some obscure reason, the time spent on creating it is not relevant without the recursion. this leaves -process as the only option. Task-number: QTBUG-36955 Change-Id: Ifd3949d9ff773780646c6f65db1629e1c19e53d2 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Add the -qreal option to the Qt ABI informationThiago Macieira2014-06-171-0/+18
| | | | | | | | | | | | | | | | | | If -qreal float is passed, fullCpuArchitecture() will now include "-qreal_float". If something else other than "float" is passed to -qreal, we'll try to encode it (e.g., -qreal "fixed<int, 7>"). Change-Id: Ie33fd1a643f4376e6f01a7966e01c7c34e6fcffd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Add support for single-file multi-target intrinsics in QtThiago Macieira2014-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GCC 4.9 now allows us to #include any and all intrinsics headers, not just the one for which we're compiling code, a behavior that ICC and MSVC have had for some time. With that, we're able to have the functions for different targets in the same source file. See the GCC manual: http://gcc.gnu.org/onlinedocs/gcc/Function-Multiversioning.html This functionality is notified by the QT_COMPILER_SUPPORTS_HERE(XXX) macro, which indicates that all the intrinsics from QT_COMPILER_SUPPORTS_xxx are available and enabled. To complement, a QT_COMPILER_SUPPORTS(XXX) macro is also added. Unlike ICC and MSVC, GCC requires a special function attribute, which will also cause code optimization. That's the QT_FUNCTION_TARGET macro. Note: because of the absence of the target attribute, ICC and MSVC will not generate instructions with the VEX prefix unless they only exist with the VEX prefix or if -mavx / -arch:AVX are enabled. Change-Id: I0c1880c20324bd8e0fc68a863e36d1fa7755dff0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSimon Hausmann2014-05-221-3/+6
|\| | | | | | | Change-Id: Ia36e93771066d8abcf8123dbe2362c5c9d9260fc
| * Strip bootstrapped binaries of unused sectionsThiago Macieira2014-05-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This matches the -ffunction-sections from bootstrap.pro, which tells the compiler to create a section for each function. The -gc-sections option tells the linker to drop what wasn't used (normally, it only drops entire files). Before (on Linux, built with -O3, no LTO): text data bss dec hex filename 1746385 7920 3750 1758055 1ad367 bin/moc 1444101 6664 1894 1452659 162a73 bin/rcc 4407725 1568 4896 4414189 435aed bin/qmake After: text data bss dec hex filename 1131655 6520 3494 1141669 116ba5 bin/moc 1027043 5480 1766 1034289 fc831 bin/rcc 3578489 1656 5313 3585458 36b5b2 bin/qmake Gain: 35% on moc, 28% on rcc, 19% on qmake Before (on OS X): __TEXT __DATA __OBJC others dec hex 1495040 12288 0 4294993008 4296500336 100176470 bin/moc 1265664 8192 0 4294983904 4296257760 10013b0e0 bin/rcc 5279744 81920 0 4297912320 4303273984 1007ec000 bin/qmake After: __TEXT __DATA __OBJC others dec hex 806912 8192 0 4294988132 4295803236 1000cc164 bin/moc 720896 8192 0 4294979764 4295708852 1000b50b4 bin/rcc 4841472 77824 0 4295580688 4300499984 100546c10 bin/qmake Gain: 46% on moc, 43% on rcc, 8% on qmake. Change-Id: Icc7cdc9fd6f5db15537b4adabaac7e7a27e539d4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Make qmake also use -ffunction-sectionsThiago Macieira2014-05-191-2/+4
| | | | | | | | | | | | | | This might lead to a smaller binary if we use --gc-sections too. Change-Id: I7e17b956a85ecefc3e187054848393d2855152b6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-05-061-25/+37
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/qnx-x86-qcc/qplatformdefs.h src/corelib/global/qglobal.h src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl.cpp src/opengl/qglpixelbuffer.cpp src/opengl/qglshaderprogram.cpp tests/auto/opengl/qglthreads/tst_qglthreads.cpp Change-Id: Iaba137884d3526a139000ca26fee02bb27b5cdb5
| * Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Jani Heikkinen2014-04-251-16/+3
| |\ | | | | | | | | | refs/staging/stable
| | * Merge remote-tracking branch 'origin/release' into stableJani Heikkinen2014-04-231-16/+3
| | |\ | | | | | | | | | | | | Change-Id: Id13b4a3803664692f32f9d57549be8a0c4a08567
| | | * Build Qt tools for iOSTor Arne Vestbø2014-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie3dc93e01ed878233c8094ca92bef25a6cf4dcd9 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | | * Revert "Automatically link printsupport plugins to static applications."Oswald Buddenhagen2014-04-181-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has been fully obsoleted by 4255ba40ab073afcf2a095b135883612859af4c2. This reverts commit 99eecab83d4a4c79979aa0b1fcf1f58c14dcf526. Change-Id: Id7b8d3bba27ff43e38e4fe32a4f2950de9ced493 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: John Layt <jlayt@kde.org>
| | | * Make HarfBuzz-NG the default shaper on MacKonstantin Ritt2014-04-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For AAT shaping support, we need either the pre-QPA shaping trick or the new HarfBuzz on Mac; prefer the latter. Disable some test cases aimed to test the HB-old behavior; enable ones that should guarantee shaping-unaware behavior. [ChangeLog][OS X] Use CoreText text shaping engine for support of complex scripts. If required, the shaping engine used in previous versions can be preferred by configuring Qt with -no-harfbuzz. Alternatively, the QT_HARFBUZZ environment variable could be set to "old". Task-number: QTBUG-18980 (relates) Task-number: QTBUG-38246 Change-Id: Iee6fe4f5bc047e77259182b8585385c5febd02b3 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| * | | configure: gtk style related cosmetical fixesMartin Jansa2014-04-251-1/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | * add -help text for gtkstyle * use capital GTK in warning message for consistency Change-Id: Iff522cc49497dda406dd111594857930d82e4231 Reviewed-by: Martin Jansa <Martin.Jansa@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | configure: make pulseaudio and alsa configurable optionsPaul Eggleton2014-04-171-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows disabling pulseaudio and alsa support at configure time making builds more deterministic. Change-Id: I4f1719cf831458b1d5ad3ebc01f6782b897d392c Reviewed-by: Martin Jansa <Martin.Jansa@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Kalle Viironen <kalle.viironen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | Make objcopy config test cross platform functionalWolfgang Bremer2014-04-141-8/+10
| |/ | | | | | | | | | | | | | | This removes the old objcopy.test script and adds a cross platform qmake project for auto detection. Change-Id: Icc7c40d72fb0ff751d214b7351e20652f7b15945 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Include GLES 3.0 and 3.1 headers when availableLaszlo Agocs2014-04-241-10/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In ES builds configure will now check for OpenGL ES 3.0 and 3.1 availability. This allows qopengl.h to include the correct header and, by defining QT_OPENGL_ES_3 and QT_OPENGL_ES_3_1, the OpenGL wrappers can provide support for MapBuffer, VAOs, etc. on GLES 3.0+ too. Right now this is not possible since the only standard way to use an ES function specific to a given version is to use the function directly. The extension mechanism (eglGetProcAddress and friends), that is often used in desktop GL, is not available for such functions. [ChangeLog][QtGui] QtGui's OpenGL headers are now automatically including the highest available header (gl31.h, gl3.h or gl2.h) in OpenGL ES builds. Task-number: QTBUG-38168 Change-Id: Ib857c58fe1696a9546fdd1aa143a9237e80325a5 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Windows: Do not link QtCore against ICU by defaultKai Koehne2014-04-241-0/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not link against ICU on Windows, unless it is explicitly requested ('-icu' configure option). This removes the QtCore->ICU dependency if ICU was detected in the configure environment. So far ICU has been used in Qt Core for - support of a larger set of codecs (805 instead of 135) - more accurate QLocale functionality (QLocale::toUpper, qLocale::toLower) - string collation However, for all functionality there are also backends using the Windows API/Registry (QLocale, QCollator), or built-in codecs that are part of QtCore. Since the ICU dependency is quite heavy (3 libs with about 25 MB) it seems sensible to not require it by default. QtWebkit is unaffected, since it has it's own ICU check. [ChangeLog][Windows] Changed configure defaults so that Qt5Core does not link against ICU libraries anymore. Pass '-icu' to enable it. Task-number: QTBUG-38259 Change-Id: I3fd3e8ac0f091f532b04945718c0e4a3cc71a087 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* fix typo in qmake source file listOswald Buddenhagen2014-04-091-1/+1
| | | | | | | | | the effect of this is negligible, as this list is only used for dependency scanning. Change-Id: Iae9fc73c8633cfc8217bc90014498d9635d53ad0 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Don't skip QtLocation on iOS.Alex Blasche2014-04-081-1/+1
| | | | | | | | QtPositioning is supported on iOS since Qt 5.3. Task-number: QTBUG-37792 Change-Id: I74729f0c99c49858032b68dd0e7c9e628ae77b12 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Update bundled libxkbcommon version to 0.4.1Gatis Paeglis2014-04-031-2/+3
| | | | | | | | | | | | | | This is the latest version, released on Mar 27 2014. It includes: https://bugs.freedesktop.org/show_bug.cgi?id=75798 https://bugs.freedesktop.org/show_bug.cgi?id=75892 Required for fixing input when running Qt application on Mac OS X with XQuartz and for fixing QTBUG-36281. Change-Id: Idc4d3c99a4008a10b91ab51c8910b36909974703 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fixes related to evdev in the configure scriptWolfgang Bremer2014-04-031-0/+5
| | | | | | | | | This adds evdev to the help, configure status output and will include it in the qconfig.h. Change-Id: Ibc07516ab07e7c53ec89b167d604f5cefa2d92b7 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Remove docs for javascript core jit configurabilitySimon Hausmann2014-04-011-3/+0
| | | | | | | | | This should've been removed in commit 24f10256631cd1e0f461430a50be36b74f19e01e Task-number: QTBUG-37832 Change-Id: I3404f17c904dbb462773f40371d09b0e58a0930d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Use configure -confirm-license option also in commercial Qt versionsKalle Viironen2014-04-011-1/+2
| | | | | | | | | Pass the -confirm-license option to external license checker which is used in Qt commercial version. Change-Id: I62326d1e6a8307dae64535ecf2ced762130b7e8f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
* Externalize license key handling from configureKalle Viironen2014-03-251-296/+16
| | | | | | | | | | Enterprise only license key handling removed from configure. This does not affect the functionality of the Open Source version nor the enterprise version. Change-Id: I01736eba3066c56b6e50e022fae8de6aa9bd884b Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* configure: Disable XCB auto-detection on MacJ-P Nurmi2014-03-221-3/+4
| | | | | | | | | | | | | Users might have (old) libxcb installed on OS X, for instance as a dependency for another package installed via MacPorts. It's still very unlikely that any Mac user would want to use the XCB platform plugin. Thus, disable the auto-detection to avoid a dubious XCB configuration error on Mac. Change-Id: I11d21aad255925883d6841444baa13a29f1a26b0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
* make -separate-debug-info saneOswald Buddenhagen2014-03-201-2/+4
| | | | | | | | | don't make it add -g flags all of its own, but instead rely on debug info being already present. Change-Id: Ifb6b33709689e979768963ae0b9f3dca4fc77eef Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 00:51:51 +0000