summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* windows: Enable ANGLE D3D11 renderer by defaultAndrew Knight2014-09-051-12/+3
| | | | | | | | | | | | | | | | | | | | | | | Also, remove the -angle-d3d11 configure option, as it no longer is necessary to select the renderer at build time. The D3D11 renderer is the default renderer in upstream ANGLE, and has been shown to be a more reliable solution for developers running over remote desktop and inside virtual machines. It also provides more features to the OpenGL ES implementation. This configuration switch does not disable the D3D9 render; if the GPU does not support D3D11, D3D9 is used instead. [ChangeLog][QtGui][Windows] The ANGLE D3D11 renderer was enabled by default. Systems which cannot use the new renderer will automatically fall back to the D3D9 renderer at runtime. Task-number: QTBUG-41031 Change-Id: If894309c07d9309c236b63c36f37679f74375133 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Make HarfBuzz-NG the default shaper on all platformsKonstantin Ritt2014-08-201-9/+10
| | | | | | | | | | [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>
* Introduce secure transport backend for Windows RuntimeOliver Wolff2014-08-131-6/+29
| | | | | | | | | | The change creates a stub implementation for WinRT, adding the needed files and classes to build SSL support on that platform. Task-number: QTBUG-37497 Change-Id: Idc3e8aa91c5eb8a938705f2385d1074fe6c1d83e Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Andrew Knight <andrew.knight@digia.com>
* Remove the last remnants of iWMMXt in QtThiago Macieira2014-08-051-19/+0
| | | | | | | | 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-08-042-7/+23
|\ | | | | | | | | | | | | | | | | Conflicts: config.tests/arch/arch.cpp src/opengl/qgl_qpa.cpp src/widgets/kernel/qapplication.cpp Change-Id: I80b442a4c2c9632743a5b5c7319ff201ec5bc4fd
| * pass --sysroot to compile tests also on windowsOswald Buddenhagen2014-08-012-0/+12
| | | | | | | | | | | | | | Change-Id: I486059197479842f32c3590d7fd269550d22698e Reviewed-by: David Schulz <david.schulz@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * add /ENTRY:main only for target buildsOswald Buddenhagen2014-08-011-2/+4
| | | | | | | | | | | | | | Change-Id: Ifa1d36607a1884ec989b5b514e7d1b9a2b40ddce Reviewed-by: David Schulz <david.schulz@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * ensure that arch_host.pro is used also on windowsOswald Buddenhagen2014-08-011-5/+7
| | | | | | | | | | Change-Id: I110ec33a40f37ecdec5ab952ea56a4fc00cd27a8 Reviewed-by: David Schulz <david.schulz@digia.com>
* | Add sqlite to Windows Phone default buildMaurice Kalinowski2014-08-021-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sqlite 3.8.5 supports Windows Phone 8.1. Make required adaptations and add it to the default build. For WinRT and Windows Phone the QSqlQueryModel unit-test fails, both with plugin compiled and using the system sqlite. Root cause seems to be deep inside sqlite, hoping for a fix soon. However, all other tests pass and hence we should enable it. Task-number: QTBUG-37770 Change-Id: I700dde4a44a8f1d74460ef6cb4a1e1d330073d66 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-292-3/+12
|\ \ | |/ | | | | | | | | | | Conflicts: src/network/ssl/qsslsocket_openssl_symbols.cpp Change-Id: Ic62419fa1fee5f4de6c372459d72e6e16f9a810b
| * Improve dbus cross compilationBernd Weimer2014-07-282-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Enable building ANGLE with D3D11 in -opengl dynamic builds.Laszlo Agocs2014-07-251-3/+7
| | | | | | | | | | | | Task-number: QTBUG-40193 Change-Id: If70943355d650cd3f20f4ff25fa09417a28a2b93 Reviewed-by: Andrew Knight <andrew.knight@digia.com>
* | Introduce qmake feature use_gold_linkerAllan Sandfeld Jensen2014-07-231-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | remove dead code relating MakeItemOswald Buddenhagen2014-07-072-38/+0
| | | | | | | | | | Change-Id: I413f038391dba02a22242eafef4a946f81babfca 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>
* | remove configure's ability to create vcproj filesOswald Buddenhagen2014-07-071-53/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the generated projects aren't optimal for building qt anyway (as rcc is not built yet, dependencies are missing), and the added value isn't all that great to start with (Qt devs typically use Qt Creator nowadays). the -no-qmake-deps option was also removed, as it affected only -vcproj. [ChangeLog][configure] The -vcproj option was removed. Use "qmake -r -tp vc" _after_ building Qt in case you want to use VS to work on Qt. Change-Id: I0207d1a89a83b70991a63a7d121a9de4cb685ca5 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Add the -qreal option to the Qt ABI informationThiago Macieira2014-06-171-2/+12
| | | | | | | | | | | | | | | | | | 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-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 "Merge remote-tracking branch 'origin/stable' into dev" into ↵Simon Hausmann2014-05-221-2/+3
|\ \ | | | | | | | | | refs/staging/dev
| * \ Merge remote-tracking branch 'origin/stable' into devSimon Hausmann2014-05-221-2/+3
| |\ \ | | |/ | | | | | | Change-Id: Ia36e93771066d8abcf8123dbe2362c5c9d9260fc
| | * Strip bootstrapped binaries of unused sectionsThiago Macieira2014-05-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+2
| | | | | | | | | | | | | | | | | | | | | This might lead to a smaller binary if we use --gc-sections too. Change-Id: I7e17b956a85ecefc3e187054848393d2855152b6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | De-inline QDebug destructorKai Koehne2014-05-223-0/+4
|/ / | | | | | | | | | | | | | | | | This injected quite some code on every use of qDebug and friends, while not giving any measurable performance benefits. Change-Id: I7b51f99130f18f1252da01e313f7b97c43a5480d Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-05-062-13/+30
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | 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 remote-tracking branch 'origin/release' into stableJani Heikkinen2014-04-232-12/+3
| |\ | | | | | | | | | Change-Id: Id13b4a3803664692f32f9d57549be8a0c4a08567
| | * Revert "Automatically link printsupport plugins to static applications."Oswald Buddenhagen2014-04-182-12/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Adding support for -separate-debug-info on win32Wolfgang Bremer2014-04-141-1/+27
| |/ | | | | | | | | | | | | | | | | There is no valid reason why separate debug info support is missing from the win32 configure app. It can be used with proper cross compilation tool chains. Change-Id: I5cf5fba24abc3b515f893a3f5b799a0644fd3218 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Windows: Do not link QtCore against ICU by defaultKai Koehne2014-04-241-1/+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>
* Android: Fix compilation on WindowsEskil Abrahamsen Blomfeldt2014-04-091-0/+22
| | | | | | | | | | | 151cf2047aa36ac395a841a3ced8b2142a997aec broke cross-compilation for Android on Windows, since evdev-support was detected, but there was no corresponding test to disable the mtdev-code in the evdev files. Task-number: QTBUG-38155 Change-Id: Ifb08fa1160a348ef64b970a89922e66dc6ddd263 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* purge vestiges of opengl es 1 supportOswald Buddenhagen2014-04-041-18/+2
| | | | | | | | amends 0d5170256c1. Change-Id: Ifa178d38f602bb7c66ef13334673ff47e332af5b Reviewed-by: Jørgen Lind <jorgen.lind@digia.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* do not define QT_NO_STYLE_S60 on WindowsJoerg Bornemann2014-04-031-4/+0
| | | | | | | This isn't needed anymore since quite a while. Change-Id: I80a99f988a917af5b8c64865ec7e73e519978740 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Windows XP target support for MSVC >= 2012Joerg Bornemann2014-04-031-1/+28
| | | | | | | | | | | | | | | | | | To enable windows xp support, we must do two things: 1. linker flag must be /SUBSYSTEM:CONSOLE,5.01 or /SUBSYSTEM:WINDOWS,5.01. For x64, the version is 5.02. 2. Do not use Windows Kit 8. Win SDK v7.1A is recommended. Prepend the right include paths and lib paths to INCLUDE and LIB before building. The Windows XP target support is enabled by passing "-target xp" to configure. Task-number: QTBUG-29939 Change-Id: I84c8439606cc2a9d27d64947702846faa4f1e4a2 Reviewed-by: Lucas Wang <wbsecg1@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix cross platform detection of evdev on win32Wolfgang Bremer2014-04-031-0/+22
| | | | | | | | | | Evdev is not known to the windows configure and therefore some code is currently broken which depends on QT_NO_EVDEV. This patch introduces evdev to the configure app on windows and disables evdev support for cross compilation if not available. Change-Id: I6acb5b593668c85a19ef8658a8d4c36ec3d2a686 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-254-194/+40
| | | | | | | | | | 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>
* Remove definition QT_EDITIONKalle Viironen2014-03-132-24/+1
| | | | | | | | Remove definition QT_EDITION which was set in configure since it is not used anywhere anymore. Change-Id: I5c30ab47c6244fcb07707fd05e11decf2068f6d1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix the name of the GPLv3 license fileThiago Macieira2014-03-061-3/+3
| | | | | | | | | | | Qt 4 used to have it called LICENSE.GPL3 since we used to have GPLv2 as an option before Qt 4.5 (which is when we added the LGPL v2.1). Looks like no one realized that the configure script looks for that file when LICENSE.GPL was added to the modularized repositories... Task-number: QTBUG-37175 Change-Id: Iffb35adf128c3e49a7a0c12dbccd5ebe9bccf3f2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* move generation of qconfig.h forwarding headers to qtbase.proOswald Buddenhagen2014-02-281-17/+0
| | | | | | | less platform-specific code. the qfeatures.h generation is already here. Change-Id: Ied69fb431eed5816fbff63b33be431ee913c2bc8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Remove the option to force no JIT in javascript coreJorgen Lind2014-02-261-7/+0
| | | | | Change-Id: I81a9968b360cf889f92e690cdf4028692b904a0c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Dynamic GL switch on WindowsLaszlo Agocs2014-02-141-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch introduces a new build configuration on Windows which can be requested by passing -opengl dynamic to configure. Platforms other than Windows (including WinRT) are not affected. The existing Angle and desktop configurations are not affected. These continue to function as before and Angle remains the default. In the future, when all modules have added support for the dynamic path, as described below, the default configuration could be changed to be the dynamic one. This would allow providing a single set of binaries in the official builds instead of the current two. When requesting dynamic GL, Angle is built but QT_OPENGL_ES[_2] are never defined. Instead, the code path that has traditionally been desktop GL only becomes the dynamic path that has to do runtime checks. Qt modules and applications are not linked to opengl32.dll or libegl/glesv2.dll in this case. Instead, QtGui exports all necessary egl/egl/gl functions which will, under the hood, forward all requests to a dynamically loaded EGL/WGL/GL implementation. Porting guide (better said, changes needed to prepare your code to work with dynamic GL builds when the fallback to Angle is utilized): 1. In !QT_OPENGL_ES[_2] code branches use QOpenGLFunctions::isES() to differentiate between desktop and ES where needed. Keep in mind that it is the desktop GL header (plus qopenglext.h) that is included, not the GLES one. QtGui's proxy will handle some differences, for example calling glClearDepth will route to glClearDepthf when needed. The built-in eglGetProcAddress is able to retrieve pointers for standard GLES2 functions too so code resolving OpenGL 2 functions will function in any case. 2. QT_CONFIG will contain "opengl" and "dynamicgl" in dynamic builds, but never "angle" or "opengles2". 3. The preprocessor define QT_OPENGL_DYNAMIC is also available in dynamic builds. The usage of this is strongly discouraged and should not be needed anywhere except for QtGui and the platform plugin. 4. Code in need of the library handle can use QOpenGLFunctions::platformGLHandle(). The decision on which library to load is currently based on a simple test that creates a dummy window/context and tries to resolve an OpenGL 2 function. If this fails, it goes for Angle. This seems to work well on Win7 PCs for example that do not have proper graphics drivers providing OpenGL installed but are D3D9 capable using the default drivers. Setting QT_OPENGL to desktop or angle skips the test and forces usage of the given GL. There are also two new application attributes that could be used for the same purpose. If Angle is requested but the libraries are not present, desktop is tried. If desktop is requested, or if angle is requested but nothing works, the EGL/WGL functions will still be callable but will return 0. This conveniently means that eglInitialize() and such will report a failure. Debug messages can be enabled by setting QT_OPENGLPROXY_DEBUG. This will tell which implementation is chosen. The textures example application is ported to OpenGL 2, the GL 1 code path is removed. [ChangeLog][QtGui] Qt builds on Windows can now be configured for dynamic loading of the OpenGL implementation. This can be requested by passing -opengl dynamic to configure. In this mode no modules will link to opengl32.dll or Angle's libegl/libglesv2. Instead, QtGui will dynamically choose between desktop and Angle during the first GL/EGL/WGL call. This allows deploying applications with a single set of Qt libraries with the ability of transparently falling back to Angle in case the opengl32.dll is not suitable, due to missing graphics drivers for example. Task-number: QTBUG-36483 Change-Id: I716fdebbf60b355b7d9ef57d1e069eef366b4ab9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* QNX: Add support for lgmonBernd Weimer2014-02-141-1/+20
| | | | | | | | | | | | | | Added configure test, whether lgmon (liquid graphics performance monitor) is available. The test is supposed to be positive only for internal BlackBerry NDKs currently. Added calls to initialize lgmon and to indicate when an app is ready for user input. Change-Id: I5cbc29fb38a86585dcebd14d462436deaa1998aa Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
* Configure: Disable widgets module too if gui module is disabledKai Koehne2014-02-111-3/+5
| | | | | | | | | Use the same logic as in the Unix configure script, and disable "widgets" if "gui" is disabled. Change-Id: Ica338ad10b965eea297dddaaedeea61a3ae3ebe9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2014-02-111-1/+1
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-02-071-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qguiapplication.cpp src/plugins/platforms/android/androidjnimain.cpp src/plugins/platforms/android/qandroidplatformintegration.cpp src/plugins/platforms/android/qandroidplatformintegration.h src/plugins/platforms/android/qandroidplatformopenglcontext.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/sql/doc/src/sql-driver.qdoc src/widgets/widgets/qtoolbararealayout.cpp Change-Id: Ifd7e58760c3cb6bd8a7d1dd32ef83b7ec190d41e
| | * QNX: Fix build on Win32 when linking against sqlite libsWolfgang Bremer2014-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Previously the linker options were overquoted which resulted in a broken Makefile. Change-Id: I2a77ad07564fc75533d6e8f29b5cbe52389bcce5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Automatically link printsupport plugins to static applications.Friedemann Kleint2014-02-082-3/+12
|/ / | | | | | | | | | | | | | | | | | | | | | | Add the required printsupport plugins to the QTPLUGIN variable as is done for the QPA plugin. [ChangeLog][QtPrintSupport] Made the Qt buildsystem automatically include the necessary plugins so that static applications can print. Task-number: QTBUG-29663 Change-Id: I0e2e3b0f25dd5714bd187711c85893926b0c4e85 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Fix configure & qmake compilation with a future MSVC versionThiago Macieira2014-02-012-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | When MSVC supports ref-qualified members, we need to ensure that qstring_compat.cpp can see the non-qualified definitions in qstring.h, which means no precompiled header. Alternatively, for a bootstrapped build we could not compile qstring_compat.cpp or #ifndef the functions. Change-Id: I8ece34503060f0b4b0f8f2df2fb9b0fb1311e269 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Replace win32-g++ with mingw scopeKai Koehne2014-01-171-1/+1
| | | | | | | | | | | | | | | | Commit 773dd01 introduced a general mingw platform scope, which is cleaner and more flexible than matching the spec name. Change-Id: Ie3a9cb791a83f7c8a51bc4e23069190c452ab521 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Remove last traces of QT_COMPILER_SUPPORTS_NEONTor Arne Vestbø2014-01-161-2/+0
| | | | | | | | | | | | | | | | | | | | | | Fixes ARM build, as the NEON drawhelpers and image conversion functions were ifdef'ed out. Follow-up to 1b12c0608be2359baa2f96ae28b135a84abd388c. Change-Id: I0b5e89c8f445741432db2dfe1f8d971b971c8605 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>