summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* configure: Initialize variables for the EGLFS backendsThiago Macieira2015-07-171-0/+3
| | | | | | | | | | | | | | | Otherwise the information is missing from configure's output summary: EGLFS ................ no EGLFS i.MX6....... . EGLFS KMS .......... no EGLFS Mali ......... EGLFS Raspberry Pi . EGLFS X11 .......... no Change-Id: Iee8cbc07c4434ce9b560ffff13cb331778c70261 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* configure: properly quote the test name containing spacesThiago Macieira2015-07-171-1/+1
| | | | | | | Such as "OpenGL ES 2.0" Change-Id: Ib306f8f647014b399b87ffff13f15f58c84a12ae Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* configure: Mention availability of linux-clangRobert Loehning2015-07-081-1/+1
| | | | | Change-Id: I2e99832b06a59b1587f98041a7d36ed69e22be94 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Fix typo in configure.Jake Petroules2015-07-061-1/+1
| | | | | | | The option is named securetransport, not secure-transport. Change-Id: I5efdde6d751cbc7e9717c6bfe0add93c5dbd2ec9 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* configure: Infer licheck bitness from platform argumentKai Koehne2015-06-291-4/+14
| | | | | | | | | We build our 32 bit Linux packages nowadays on Red Hat 64 bit with -platform linux-g++-32. Honor this when selecting the right licheck binary to use. Change-Id: I08527295bc461c8cdd07e81a10c93a8f010b787d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Document -secure-transport parameter in configureDaniel Molkentin2015-06-141-0/+2
| | | | | Change-Id: Iea658e37b681c54de35307b1e587adf0efd70970 Reviewed-by: Richard J. Moore <rich@kde.org>
* xcb: Use XIGrabDevice instead of xcb_grab_pointer with XI 2.2Laszlo Agocs2015-06-011-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to using the pointer events from XI2 when touch is available (i.e. version is >= 2.2). This allows us to select and grab the button and motion events together with the touch ones. This prevents the issue of not getting touch events when grabbing via the plain xcb functions. To prevent touch sequences from being replayed after ungrabbing (for example after dismissing a popup that caused a grab), we try to accept touches via XIAllowTouchEvents. Unfortunately this leads to a deadlock and therefore we can only do it when we know we have a new enough libXi. This is a configure time check which is not ideal since the system on which apps run can have a newer libXi than the machine that did the Qt build, but seems like the best we can do. The environment variable QT_XCB_NO_XI2_MOUSE can be set to 1 in order to prevent processing mouse events through XInput. This restores the old behavior with broken grabbing. [ChangeLog][QtGui] Pointer event delivery on X11 is now done via XInput 2.2+ when available. Done-with: Michal Klocek <michal.klocek@theqtcompany.com> Done-with: Alexander Volkov <a.volkov@rusbitech.ru> Task-number: QTBUG-43525 Task-number: QTBUG-45054 Task-number: QTBUG-30417 Change-Id: I7cb2002b31bef4cd527aa427549dcf2d5467968e Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Fix wording of error messageKai Koehne2015-05-271-1/+1
| | | | | | | This broke with commit 83a5694dc21b8 . Change-Id: Ib641cef9639f1c70a5f38ce0e5d9d9e3071373e4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Run license checker in qmakeKai Koehne2015-05-271-1/+6
| | | | | | | | | | | | | | | | | Check for a valid license not only in configure, but also in qmake. To limit the runtime overhead we cache the day of the last run in a .stash file. This allows us to run licheck only for the top-level qmake call, and only once per day. This requires an updated licheck executable that supports the new check mode. [ChangeLog][Tools][qmake] For commercial builds, qmake now checks for a valid Qt license. This requires setting up a Qt Account (or .qt-license file) on the development machine. Change-Id: I2c2a05a4602cc661560568b76ddf520cb8134769 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Resolve path to right licheckKai Koehne2015-05-271-2/+14
| | | | | | | | | In the unix commercial packages, licheck so far has been a shell script that redirected to the 'right' licheck. To simplify things we now resolve the right executable path in configure itself. Change-Id: I1183d000a11bf42729f3e0405a0bc1d4b618933c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Make Qt Edition available to qmakeKai Koehne2015-05-271-0/+2
| | | | | | | | Allow .pro, .prf ... files to check the edition (OpenSource, Evaluation, Preview, Enterprise ...) of the Qt installation. Change-Id: If2a8e3877d066b225b1777916cef1d23c65f8512 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Build qtconnectivity for iOS.Alex Blasche2015-05-131-1/+1
| | | | | | | | Starting with Qt 5.5 qtconnectivity on iOS is supported Change-Id: I30430ce351b7e2fc8031c5719bed5354ed234cc7 Task-number: QTBUG-45988 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
* Build Qt for OS X and iOS with relative rpath.Adam Strzelecki2015-05-131-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 locations (including cocoa plugin) are 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: I36b9384cd69ac609608acbe2b3d5e0512317e0d6 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* rpath: use new DTAGS if availableOswald Buddenhagen2015-05-051-0/+10
| | | | | | | | | | | | | | this allows LD_LIBRARY_PATH to take precedence over the hard-coded rpath, which is the only sane thing to do (which is also why i'm not adding an option to disable it). this behavior is consistent with non-linux systems. the windows version has no auto-detection, just like for gold linker usage. Task-number: QTBUG-3069 Change-Id: Ief9ba032291c898d75d76ecc740390954382a804 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* make linkerSupportsFlag() use gold linker if detectedOswald Buddenhagen2015-04-231-0/+3
| | | | | | | subsequent tests should depend on the detected linker, obviously. Change-Id: I09aa9f1f2ef789f0ae0829f9122211fc4e1ad518 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* compilerSupportsFlag(): remove bogus .o suffix from test executablesOswald Buddenhagen2015-04-231-3/+3
| | | | | | | | this function does not just compile, but it also links, so the output file should have no object file extension. Change-Id: I65dd9bd334478545ceeabe9d1aacb44d9583cdd7 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Implement a more direct headersclean checkThiago Macieira2015-04-171-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test each include file directly, instead of doing a large #include. This verifies that each header is compilable on its own. One big advantage of doing it via a special compiler in qmake is that we skip pre-compiled headers, which has hidden build errors in the past. This solution is implemented by making syncqt produce a second list of headers. This list is the same as the list of headers in the source code to be installed, minus the headers that declare themselves to be unclean, via the pragma: #pragma qt_sync_skip_header_check This mechanism is applied only for public libraries (skipping QtPlatformSupport, an internal_module). This test is enabled only for -developer-builds of Qt because it increases the compilation time. On QtTest: the library only links to QtCore, but it has two headers that provide inline-only functionality by including QtGui and QtWidgets headers (namely, qtest_gui.h and qtest_widget.h). If those two modules aren't getting compiled due to -no-gui or -no-widgets to configure, we need to remove the respective headers from the list of headers to be checked. If they are being built, then we need to make QtTest's build wait for the headers to be generated and that happens when qmake is first run inside the src/gui and src/widgets directories. Change-Id: I57d64bd697a92367c8464c073a42e4d142a9a15f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Allow overriding ar binary in configure script by setting AR env varAlex Richardson2015-04-071-2/+9
| | | | | | | | | Unlike all the QMAKE_* command variables it requires the arguments "cqs" to be part of the variable. This means we need to append the arguments for compatibility with autoconf. Change-Id: I961e89d506612873ba1f9cbecff97c448e83a5a2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* don't print "progress bar" when stdout is no ttyOswald Buddenhagen2015-03-271-2/+2
| | | | | Change-Id: I8da61d7f7d4fe4f68b266d248fda53acd10d4372 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* don't suppress compiler output in verbose modeOswald Buddenhagen2015-03-271-1/+5
| | | | | Change-Id: Id628c117bd3f90f7988e6fe4f9c0b12d5ca287e7 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* suppress compiler output in compilerSupportsFlag()Oswald Buddenhagen2015-03-271-2/+2
| | | | | | | | | that also covers linkerSupportsFlag(), which did it explicitly so far. Task-number: QTBUG-45010 Change-Id: I2eb0bd5282fd2f24c9ab8041c3536a6115caa765 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* eglfs: Pluginize RPi, iMX6 and Mali backendsLaszlo Agocs2015-03-051-1/+31
| | | | | | | | | | | | | | eglfs does not depend on the device makespecs anymore when it comes to these device integration backends (hooks). Instead, backends are autodetected by configure. The name of the preferred plugin is still set in the device makespecs. This is optional. When not set and there is more than one plugin present in the system, the environment variable QT_QPA_EGLFS_INTEGRATION will have to be set at runtime. In the absence of that, the order is undefined. Change-Id: Ie1ced2c9aa1beff2adb13b4fdea7c499cb5a6aab Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* Fix disabling libinput feature if libudev is not availablePasi Petäjäjärvi2015-03-051-0/+2
| | | | | | | | | | When using default configure value (auto) for libudev + libinput and libudev is not available, disabling libinput failed and it is enabled even it requires libudev to work. Change-Id: Ia2ead66c5cebc8658f2c29445f5c81c9f8b30dc8 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5Oswald Buddenhagen2015-03-021-4/+10
|\ | | | | | | Change-Id: I95b3a87c5068c6b8068b30a35655b4c2419e7f9e
| * configure: add '-psql_config' optionPeter Seiderer2015-02-251-3/+9
| | | | | | | | | | | | | | | | | | | | | | Allow setting of pg_config path for cross compilation where pg_config is not in the command search path (do the same as for mysql_config). This is e.g. used for buildroot (see [1] for details). [1] http://lists.busybox.net/pipermail/buildroot/2015-February/119714.html Change-Id: I11d084496ffbb6f8bc350dbcf2971a5be8e3b346 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * configure: fix gold linker support detectionPeter Korsgaard2015-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | While the -fuse-ld=gold flag is related to linking, it is an argument to the compiler driver to tell it what linker to execute, NOT an option to tell the linker to behave differently. So it shouldn't get prefixed with -Wl when passed though the compiler driver. Change-Id: I2b50cb6d2bd8911aa9b305cd8e755d4dfe923041 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Android: Don't include Qt D-Bus by defaultEskil Abrahamsen Blomfeldt2015-02-251-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recently, a dependency on Qt D-Bus was added to Qt Platform Support if Qt was configured to support it. Since Qt defaults to checking for Qt D-Bus at run-time, the platform plugin and thus all applications would depend on libQt5DBus.so. Qt D-Bus really doesn't make much sense on Android, so we default to disabling it instead on this particular platform. People with use cases where this might be used can still configure Qt to include support by passing -dbus to configure. Note that this makes OS X and Linux builds consistent with Windows builds, where Qt D-Bus was already disabled because the dbus.h header was missing. Change-Id: Id733ff00918c706bf1aa5a667299e7d578b4b0c1 Task-number: QTBUG-44581 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-241-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/xml/htmlinfo/simpleexample.html examples/xml/rsslisting/rsslisting.cpp qmake/generators/win32/msbuild_objectmodel.cpp src/3rdparty/harfbuzz-ng/src/hb-private.hh src/corelib/global/qlogging.cpp src/corelib/io/qstorageinfo_unix.cpp src/corelib/thread/qwaitcondition_unix.cpp src/gui/kernel/qguiapplication.cpp src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp src/testlib/doc/src/qt-webpages.qdoc tests/auto/other/qaccessibility/tst_qaccessibility.cpp Change-Id: Ib272ff0bc30a1a5d51275eb3cd2f201dc82c11ff
| * Fix help in configure for -separate-debug-info optionPasi Petäjäjärvi2015-02-121-2/+2
| | | | | | | | | | | | | | | | Option -separate-debug-info is not enabled by default, even help claims it to be enabled. Change-Id: I4a986acbb2b7f2c7bf7feaaff29bcc6bfadcc559 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | support spaces in build and install dirsOswald Buddenhagen2015-02-171-1/+1
| | | | | | | | | | | | | | | | spaces in the source dir are not supported for now, as that requires some more profound refactoring of the bootstrap makefiles. Change-Id: Ie0c07a1558b8326f642f2ea144bc1cd85ee761af Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | use relative paths for build dir referencesOswald Buddenhagen2015-02-171-1/+1
| | | | | | | | | | | | | | | | apart from being more readable, it has the side effect of being resistant to spaces in the build path. Change-Id: Id12603c3a96765913e747fba4070d49de0705315 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Use C++ <cmath> instead of <math.h>Allan Sandfeld Jensen2015-02-161-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Including math.h can pollute the default namespace, and break some compilers if cmath versions of the method are declared as using. Switching to C++ math functions also greatly simplifies handling of float qreal as C++ automatically chooses the right method. [ChangeLog][QtCore][QtMath] qmath.h no longer includes math.h, so any sources depending on that indirect inclusion may fail to build. Change-Id: I4d0e331dafba354ec05dc5052e61ef4ff8d387fe Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* | Add configure option and tests for GStreamer.Yoann Lopes2015-02-161-1/+68
| | | | | | | | | | | | | | | | | | | | Qt Multimedia can be compiled with either GStreamer 0.10 or 1.0. 0.10 takes precedence over 1.0 if both are available (1.0 will be used by default in Qt 5.6). Auto-detection can be overridden with -gstreamer <version>. Change-Id: I74d58d2c146c842902375b4d1e5e6e96d32addac Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Avoid hardcoding build date in qtcore and toolsSune Vuorela2015-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | To ensure QtCore can be rebuilt and get the exact same results, it is undesirable to hardcode the build date into the library Also deprecate QLibrayInfo::buildDate since it is relies on the build date. QLibraryInfo::buildDate was originally meant for evaluation licenses and such, but isn't used for that any longer. Change-Id: I98e91ca3e55f877e6ac0e02de289dc29422fc9da Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Update copyright headersJani Heikkinen2015-02-111-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Outdated header.LGPL removed (use header.LGPL21 instead) Old header.LGPL3 renamed to header.LGPL3-COMM to match actual licensing combination. New header.LGPL-COMM taken in the use file which were using old header.LGPL3 (src/plugins/platforms/android/extract.cpp) Added new header.LGPL3 containing Commercial + LGPLv3 + GPLv2 license combination Change-Id: I6f49b819a8a20cc4f88b794a8f6726d975e8ffbe Reviewed-by: Matti Paaso <matti.paaso@theqtcompany.com>
* | Add libproxy backend for QNetworkProxyFactoryDaniel Molkentin2015-02-051-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It will be used on Unix systems if the required dev package is present. (Detected by a configure compile test.) You can configure with -no-libproxy to avoid the dependency. It will not be used on OS X or Windows, as we already implement the native API for getting proxies there. Currently we use whatever PAC runner is provided by the distro for running PAC scripts - if we want to run PAC scripts using Qt, then we would have to implement a pacrunner plugin to libproxy. Note that their webkit pacrunner is using javascriptcore already. Tested using the libproxy 0.4.7 that is included in Ubuntu 12.04. Re-tested using Ubuntu 14.04 which ships libproxy 0.4.11. It works except when both socks and http proxies are configured in the manual settings - in that case libproxy returns only the socks proxy. This seems to be covered by libproxy issue 119. [ChangeLog][QtNetwork] Introduce libproxy backend for Unix platforms, enabled automatically if the required dev package is present Task-number: QTBUG-26295 Change-Id: I521c0a198fcf482386ea8a189114a0077778265c Reviewed-by: Richard J. Moore <rich@kde.org>
* | introduce /dev variants of qmake propertiesOswald Buddenhagen2015-02-051-3/+3
| | | | | | | | | | | | | | | | | | these reflect the on-target paths (unlike /raw, which are host paths, just without the -sysroot). this is necessary for anything deployment-related, starting with RPATH. Change-Id: I13d598995d0e4d6cb0dc1fc7938b8631cf3e3a95 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | write relative paths to qconfig.cpp as far as possibleOswald Buddenhagen2015-02-051-174/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this cuts down the bloat in the binaries and the binary patching requirements in the installer. as a side effect, the sysroot and makespecs are not binary patchable any more as well, which is ok, as the installer does not do it anyway. we now also warn if -[host]<foo>dir is not a subdir of -[host]prefix, as putting things outside the prefix is anti-thetical (the obvious exception being the (unix-only) -sysconfdir). Change-Id: I878f0e71a4dfcfd55b2f8b1cf3045b98b502569b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | remove trailing semicolons from #definesOswald Buddenhagen2015-02-051-3/+3
| | | | | | | | | | Change-Id: I522a7e838ab0e5bbe5b22296ab74912ea79468f0 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | make makeabs a functionOswald Buddenhagen2015-02-051-21/+41
| | | | | | | | | | | | | | there is no reason at all for it to be an external script. Change-Id: I836f38dd06f61350dd9f83015857abb07981c62d Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | configure --help clarifications relating to -*prefixOswald Buddenhagen2015-02-051-7/+6
| | | | | | | | | | Change-Id: I71c78b7c91c9fedb7d55731b3f61d46ea75c9b8d Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | make configure -redo and config.status able to handle spaces in argumentsOswald Buddenhagen2015-02-041-2/+8
| | | | | | | | | | Change-Id: If6ffe381b03595885570ae431a9937c6fdce164b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | remove support for ancient /bin/sh which mishandle empty "$@"Oswald Buddenhagen2015-02-041-5/+1
| | | | | | | | | | Change-Id: Id936a48e8b9a5b8e15512481e464a0e9366b9152 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Update for libinput 0.8Laszlo Agocs2015-02-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | We don't yet have API compatibility, apparently, so we need to keep up with those changes. Dropping support for older versions is not yet acceptable since some distros (in particular current version of some embedded ones) may ship these versions. Change-Id: Ibea780abd76c4b89661012dfea46868b432ded42 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Add SecureTransport based SSL backend for iOS and OS XJeremy Lainé2015-02-021-1/+20
| | | | | | | | | | | | | | | | | | | | | | Add support for SSL on iOS/OS X by adding a SecureTransport based backend. [ChangeLog][QtNetwork][QSslSocket] A new SSL backend for iOS and OS X, implemented with Apple's Secure Transport (Security Framework). Change-Id: I7466db471be2a8a2170f9af9d6ad4c7b6425738b Reviewed-by: Richard J. Moore <rich@kde.org>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-211-15/+29
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/global.pri src/corelib/global/qcompilerdetection.h src/corelib/global/qglobal.h src/corelib/tools/qdatetime.cpp src/plugins/platforms/xcb/qxcbscreen.h src/plugins/platforms/xcb/qxcbwindow.h src/widgets/dialogs/qcolordialog.cpp src/widgets/dialogs/qcolordialog_p.h tools/configure/configureapp.cpp Change-Id: Ie9d6e9df13e570da0a90a67745a0d05f46c532af
| * Print some debugging information for pkg-config detectionThiago Macieira2015-01-091-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit d44781730ccd4d48af79f480813bf3f9a4000253 disabled use of pkg- config on Mac, which in turn automatically disables all of the tests that depend on pkg-config too, like D-Bus. If you then use the -dbus flag, configure would error out telling you that it couldn't find D-Bus, despite it being there. Now we print some helpful information on error and extra information for finding out why it may have got disabled. Change-Id: Ic4e41c58d62d80eb1a0f3ca1c93529e049aaf231 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * allow detection of static/shared target in the config testsAshish Kulkarni2015-01-091-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | It was not possible to determine whether Qt is being built as a shared or static library in the config tests, as that information was not added to QMAKE_CONFIG used in the compileTest function. For linking to ICU on Windows, there is logic which depends on it in config.tests/unix/icu/icu.pro, but was broken for the static target, as the expected library name was not found (icuXX -> sicuXX). Change-Id: I22c2d543ea14feebbad36961c9a29e99f66323ff Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * Complete the work for the runtime libdbus-1 supportThiago Macieira2015-01-061-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | Commit a2da88712f1e057747f68a28361b300faac5e605 was incomplete. Though it did enable building of QtDBus without the libdbus-1 headers, but it still kept looking for it. We don't need to do it anymore if CFG_DBUS is the default (runtime), so skip the actual check. This commit does not change behavior. All it does is skip the D-Bus tests if we're about to use dlopen'ed libdbus-1. Change-Id: I3947443c9ef6cc409cb6b154564f8af6fb5de84e Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * Fix build on Linux when dbus headers cannot be foundSimon Hausmann2015-01-061-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When CFG_DBUS != "no", we enable the build of linuxaccessibility in src/platformsupport, which requires QT += dbus to work. When no dbus headers are found, CFG_DBUS is set to runtime, which means we'll enable a11y but "dbus" will not end up in qconfig.pri and therefore src/dbus is not built at all (and not before platformsupport). Therefore the build in platformsupport breaks. So even if CFG_DBUS is set to "runtime" we need to make sure that dbus appears in qconfig.pri. Task-number: QTBUG-43205 Change-Id: Ibbe5e66552226cdcc1ce16fb83556406f3bb0e09 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>