summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | Rename QML debug macro to Qt naming stylePasi Petäjäjärvi2015-01-161-1/+1
| | | | | | | | | | | | | | | | | | With change macro is in line with QT_NO_<feature> style of naming macros. This way it will also be automatically added to file mkspecs/qmodule.pri in QT_NO_DEFINES value. Change-Id: I111d07fd015994290c54e00e8aac2d6dbdb7de9e Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
* | Add a configure-time check for an IPC supportTobias Koenig2015-01-091-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | Adds a configure check for System V and POSIX IPC. System V takes precedence over POSIX IPC, and if both are not supported, QT_NO_SHAREDMEMORY and QT_NO_SYSTEMSEMAPHORE are defined. This patch is a forward-port from 4.8 branch (6ef4abaa9cd7d465cbae5cbf8cb4664bef387d10). Change-Id: I3ec20342f0f0266843479634109b67c6989dd296 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Haiku: Add support for Haiku to build systemTobias Koenig2014-12-211-1/+5
| | | | | | | | | | | | | | | | Change-Id: I12afaeb53a7f35c3f02776d28dad96107f3c5819 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Augustin Cavalier <waddlesplash@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | Add libinput supportLaszlo Agocs2014-12-201-54/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Supports relative pointer, axis, keyboard and touch events. libinput support is only available in combination with libudev. libxkbcommon is required to perform key mapping. For now the default keymap is used always (selected when building xkbcommon). [ChangeLog][QtGui] Added a plugin to get mouse, keyboard and touch events via libinput. Change-Id: I469d8992c0cd3e79225cefaeb931697baf86a92b Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Add a compileTestWithPkgConfig helper function to configureJørgen Lind2014-12-141-15/+46
| | | | | | | | | | | | | | ... and use it with the opengl compile tests. Change-Id: I402574be332e41c721a758e63a233d193224f16b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into devSimon Hausmann2014-12-101-4/+9
|\| | | | | | | | | | | | | | | Conflicts: doc/global/template/style/online.css mkspecs/android-g++/qmake.conf Change-Id: Ib39ea7bd42f5ae12e82a3bc59a66787a16bdfc61
| * Merge remote-tracking branch 'origin/5.4.0' into 5.4Simon Hausmann2014-12-051-2/+2
| |\ | | | | | | | | | Change-Id: I0cd11cbe95693b78450ea81a0187760f4a6a8b5f
| | * Make QtDBus compile without libdbus-1 headers, if dlopeningThiago Macieira2014-12-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of QtDBus already needs very little from libdus-1, so create an extra header containing the minimum API we actually need. One large advantage of this solution is that now QtDBus can always be enabled, even if the system doesn't have libdbus-1 installed. This is interesting on OS X, where libdbus-1 is often installed by Homebrew or MacPorts, which may include extra libraries we don't want in our packaging. Change-Id: I1b397121ec12eeca333ef778cf8e1c7b64d6b223 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * | Configure: Fix detection of GCC 5Thiago Macieira2014-12-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $ gcc-5 -dumpversion 5 No dots. Change-Id: I5dd547f257718c981e7be64fca3eec980136ba3e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * | Pass cflags, not incdir, to libudev config testLaszlo Agocs2014-12-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | The compile.test script expects -I... parameters. Passing just the include path is therefore wrong. Pass cflags instead. Change-Id: I0f9b155d1e710fe7d77c64a867a89290d4f31db3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * | Merge remote-tracking branch 'origin/5.4.0' into 5.4Frederik Gladhorn2014-11-271-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-5.4.0 7231e1fbe24102f2a93b34dfa70e3dca884440d2 went into 5.4 instead of the 5.4.0 branch, thus the conflict. Change-Id: I70b8597ab52506490dcaf700427183950d42cbd1
| | * Android: Report error when OpenSSL is on and headers are missingEskil Abrahamsen Blomfeldt2014-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was an override for Android which would disable the configure error when doing an OpenSSL build without having the headers available. This has several times lead to packaging errors where OpenSSL gets disabled but it's not noticed before the package testing, which delays the process. I'm not 100% sure of the reasoning behind the override, but I think it's a left-over from Necessitas where OpenSSL was statically linked into Qt. Change-Id: I2bdc33fb60c59cd493987959d4bbbbb4e9735a92 Task-number: QTBUG-42851 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Hide the output of make in qmake's dir inside configureThiago Macieira2014-12-031-1/+16
| | | | | | | | | | | | | | | | | | | | | Unless the -v option is passed Change-Id: I16b2e6a42ccfc8d913517621f8f2e3bbcf9c4635 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-11-271-0/+3
|\| | | | | | | | | | | Change-Id: Id20053d261b4fbbcc0ac8ba49dd3ef2253fa4b95
| * | Don't say "Neon... auto" when ARM Neon isn't detectedThiago Macieira2014-11-251-0/+3
| | | | | | | | | | | | | | | | | | | | | Just say "no". Change-Id: I382d612ad0a7f4031b1891e7e4d9158db07badf1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-11-241-1/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qiodevice.cpp src/plugins/bearer/linux_common/qofonoservice_linux.cpp src/plugins/bearer/linux_common/qofonoservice_linux_p.h src/plugins/platforms/android/qandroidplatformtheme.cpp src/tools/bootstrap/bootstrap.pro src/widgets/styles/qmacstyle_mac.mm Change-Id: Ia02aab6c4598ce74e9c30bb4666d5e2ef000f99b
| * | Merge remote-tracking branch 'origin/5.4.0' into 5.4Frederik Gladhorn2014-11-211-1/+6
| |\| | | | | | | | | | Change-Id: I95f235a66ce2e9b1fa435c0f911c6f7e811755f0
| | * Revert "Build Qt for OS X and iOS with relative rpath"Morten Johan Sørvig2014-11-171-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change was made too late in the 5.4.0 release cycle, and broke the Qt build and deployment in several areas: - macdeployqt - OS X 10.7 builds - shadow builds This reverts commit c0a54efc4091b365ffac09fc2827cf92f849d698. Change-Id: I1c1ad4901228f5516352ccdfa963e8ea2b5013b6 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 16:52:06 +0000