summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* purge -separate-debug-info=nocopyOswald Buddenhagen2014-03-201-7/+0
| | | | | | | | clearly, this was a poor man's implementation of -force-debug-info. Change-Id: Ib5c7e390bd0e3a6912af8c4027074a114ed33f8a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* make -separate-debug-info configure tests saneOswald Buddenhagen2014-03-201-11/+3
| | | | | | | | | | | as the option needs to be explicitly requested, just error out when objcopy is bad. also, disabling it after performing the test successfully isn't a very clever thing to do. hpux is dead anyway, so just remove that logic. Change-Id: I923a3912fc29da646c492c27aa29091ffeb2e42d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* do not silently accept -separate-debug-info -staticOswald Buddenhagen2014-03-201-1/+5
| | | | | | | these options are mutually exclusive. Change-Id: Ia401edc543a2c2a111798fb4de4db453762efb64 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Update bundled libxkbcommon version to 0.4.0Gatis Paeglis2014-03-191-44/+41
| | | | | | | | | | | | | This release comes with important bug fixes. Also we can now remove the workaround code which was needed for libxkbcommon 0.2.0. Task-number: QTBUG-31712 Task-number: QTBUG-33732 Task-number: QTBUG-34056 Change-Id: I57caf7f803b9a01a15541a5ad82e464de3b8abbb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix no-opengl build with eglLaszlo Agocs2014-03-171-1/+1
| | | | | | | | | | | | Disable eglfs and similar plugins when opengl is not enabled. (but egl is present) GL-dependent parts of eglconvenience need to be skipped too. Task-number: QTBUG-37457 Change-Id: I44d49495241551bc7b1f565aa0b5ace9f310628e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* Remove definition QT_EDITIONKalle Viironen2014-03-131-20/+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>
* Remove unused QMakeVar QT_NO_XCBGatis Paeglis2014-03-071-3/+0
| | | | | | | | Grepping in Qt source code for QT_NO_XCB didn't find any references to this variable. Change-Id: Iabe5679f8b066facede2ac3bfc8c14ec4c0473a2 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* Remove usage of QT_NO_SHAPEGatis Paeglis2014-03-071-1/+1
| | | | | | | | | | | | | First of all QT_NO_SHAPE was never set in configure script, which means that !contains(DEFINES, QT_NO_SHAPE):LIBS += -lxcb-shape always was true and we were linking to -lxcb-shape no matter what. Secondly, we are providing shape.c in qtbase/src/3rdparty/xcb/libxcb, so users always have an -qt-xcb option available to get this extension. Change-Id: I7d14a0ac5ca6e36fb9c053225916cae41028b532 Reviewed-by: Uli Schlachter <psychon@znc.in> Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* Improve xkb config root detectionGatis Paeglis2014-03-061-1/+30
| | | | | | | | | | | | | | | | | | | | | | Relevant part from libxkbcommon's configure.ac file: xkb_base=`$PKG_CONFIG --variable=xkb_base xkeyboard-config` if test "x$xkb_base" = x; then xkb_base=$datadir/X11/xkb fi AC_ARG_WITH([xkb_config_root], [AS_HELP_STRING([--with-xkb-config-root=<path>], [Set default XKB config root (default: xkeyboard-config install path)])], [XKBCONFIGROOT="$withval"], [XKBCONFIGROOT="$xkb_base"]) AC_SUBST([XKBCONFIGROOT]) This patch implements an equivalent logic in Qt's configure script (with some additions). Change-Id: I25968f76021e120e2439d2756121bbe3c5e18c98 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix the name of the GPLv3 license fileThiago Macieira2014-03-061-4/+4
| | | | | | | | | | | 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-30/+0
| | | | | Change-Id: I81a9968b360cf889f92e690cdf4028692b904a0c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Re-group and re-sort the configure outputThiago Macieira2014-02-221-11/+11
| | | | | | | | | G does not come after I. That's actually my fault, in the original commit. But some options have been added since then in the wrong place and/or using wrong settings for the report_support function. Change-Id: Ib3f7d58a41059e5e7f97fd0e223b9629664686ad Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* QNX: Add support for lgmonBernd Weimer2014-02-141-0/+21
| | | | | | | | | | | | | | 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>
* Make xcb compile with X-less EGL implementationsLaszlo Agocs2014-02-091-0/+18
| | | | | | | | | | | | On platforms like the Raspberry Pi the EGL implementation is not compatible with X. This means that while EGL and Open GL ES can be enabled, and will work fine with platform plugins like eglfs, EGL (and thus GL) should be automatically disabled in xcb, otherwise a compilation error will occur since xcb assumes the native handle types are the corresponding Xlib types. Task-number: QTBUG-36551 Change-Id: I2cc4c558abb4b25d422a2c01da9b75b865ace402 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* Automatically link printsupport plugins to static applications.Friedemann Kleint2014-02-081-0/+13
| | | | | | | | | | | | 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>
* Set QMAKE_X11_PREFIX also when Qt configure with -qt-xcbGatis Paeglis2014-02-041-8/+8
| | | | | Change-Id: Ib9ca7edb1e914275a415b6c74ef691838415a40f Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Make HarBuzz-NG the default shaper on MacKonstantin Ritt2014-01-311-0/+6
| | | | | | | | | | | | | | | Since we dropped all platform-related shapers during the QPA refactoring, thus making HarfBuzz the only shaper on all platforms, we can not deal with AAT-capable fonts anymore. HarBuzz-NG now supports it's own shaper backend infrastructure, so the decision was to enable HB's CoreText shaper backend on Mac and simply make HB-NG the default shaper there. Task-number: QTBUG-36056 Change-Id: If22e24fd5cc00c25952934332a2f4123f38135a4 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Don't rely on makedepend on OS XTor Arne Vestbø2014-01-251-6/+12
| | | | | | | | | | | It's not shipped as part of the default installation, but the binary in /usr/X11R6/bin/makedepend exists and will trigger a dialog that asks you to install X11. This is not needed when we can use the compiler to resolve the dependencies for us. Change-Id: I67e35a63d0f7101b7673127228df4dcefd3c1fdc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* iOS: Enable building of basic testsTor Arne Vestbø2014-01-221-1/+1
| | | | | | | Allows us to sanity check the iOS build in the CI. Change-Id: I16f9bfafef3988dcab6efd3155503ca0d0b4d1d8 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2014-01-211-67/+67
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-201-67/+67
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/corelib/tools/qstring.cpp src/gui/image/image.pri src/gui/image/qimage.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/eglfs/qeglfshooks_stub.cpp tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp Change-Id: I3b9ba029c8f2263b011f204fdf68c3231c6d4ce5
| | * Fix detecting the system pathOlivier Goffart2014-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The normalize function don't do well it's job. Given a path like that, the regexp "/[^/]+/.." will match 3 times /usr/lib/gcc/x86_64-unknown-linux-gnu/4.8.2/../../../../include/c++/4.8.2 [ ][ ][ ] The second match is wrong as it will remove /../.. Use sub instead of gsub which only remove one match at the time. Change-Id: I0657bc603e521c9e53b9f50d2481dce184b64bad Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * consistently use single quotes to quote sed & tr argumentsOswald Buddenhagen2014-01-151-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... except where they actually contain variable expansions. unescaped backslashes in double quoted strings aren't nice, and apparently actually break with old solaris shells. Task-number: QTBUG-14167 Change-Id: I703694b6ac7ab71d9293c049d77212e20dd5bcb0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Run non-xcb X tests also with -no-xcbLaszlo Agocs2014-01-151-36/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing -no-xcb disables xcb and related configuration tests completely so for example QT_NO_XRENDER is not defined. This results in linker errors in glxconvenience with -no-xcb since the XRender calls are compiled in without linking to the library. The XRender, XInput and such tests are not strictly xcb related and may be used from elsewhere, for example glxconvenience which has nothing to do with xcb. Therefore these tests are moved in configure so that they are run even when xcb is disabled. Task-number: QTBUG-35644 Change-Id: I77871612ea5f6711ecafd8ca53aac6c516c19e2e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * Use custom -I,-D and -L flags when building arch-testJürgen Hunold2014-01-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Needed for using alternate stdlib implementation like libc++ with clang. Change-Id: I1782f62f5e2ea95e6cff8a1ed646362c0a31645c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Support logging direct to journald, if enabled.Robin Burchell2014-01-211-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of merely intercepting logging output from stdout/stderr from the journal side of started processes, this has the advantage of meaning that the origin process name will be correct. fprintf won't work, because if a process starts children (like e.g. a homescreen does), then their stdout/stderr are merged into their parent, and journal has no way of differentiating the origin. We are also able to store information about the context of logging, which might be useful in post-mortem cases. [ChangeLog][Platform Specific Changes][Linux] Systems with systemd may now pass -journald to configure to send logging output to journald. Logging will still be sent to stderr for interactive applications (run from a tty) or with QT_NO_JOURNALD_LOG set to a non-empty value. Change-Id: Ib260cec1ea87390bf44f267d217d795583407d00 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Use pkg-config to find the prefix for X11 installGabriel de Dietrich2014-01-201-0/+8
|/ / | | | | | | | | | | | | | | | | | | | | Needed to run the XKB extension where we used to expect X11 to be installed in /usr. In FreeBSD, for instance, X11 is installed in /usr/local like all the other not out-of-the-box packages. Same thing goes for the compose platform input context plugin. Change-Id: Ib7ace3117eaacc6e150394450d1330cba654ba8a Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
* | Remove last traces of QT_COMPILER_SUPPORTS_NEONTor Arne Vestbø2014-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Remove runtime detection of Neon on ARM CPUsThiago Macieira2014-01-161-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | Now the only way to enable Neon support is to change the mkspec. [ChangeLog][Important Behavior Changes] Qt no longer checks for support for the Neon FPU on ARM platforms at runtime. Code optimized for Neon must be enabled unconditionally at compile time by ensuring the compiler supports Neon. You may need to edit your mkspec for that. Task-number: QTBUG-30440 Change-Id: I4df9b2bf3cd022f8ed70f02f16878cb2cb3fe6fb Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | iOS: Enable C++11Tor Arne Vestbø2014-01-131-1/+0
| | | | | | | | | | | | | | We already require iOS 5.0 for deployment. Change-Id: Idc175892297aacc904888b7f213318e5df69f975 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-061-1/+1
|\ \ | |/ | | | | Change-Id: I0b021b369725b73f09faa14b9da9e2431dc24fad
| * Keep the configure listing of features alphabeticalThiago Macieira2014-01-041-1/+1
| | | | | | | | | | Change-Id: I0786b26a89e3e592bc47cb016ee7876ea7238c69 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>