summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.7' into devSimon Hausmann2016-02-191-13/+13
|\ | | | | | | Change-Id: I7bee7df50af3d607a349b68103cd2c67791281fb
| * Merge dev into 5.7Oswald Buddenhagen2016-02-171-118/+103
| |\ | | | | | | | | | Change-Id: I5c60b4d9fd8355ddd49a01e21861f36afbbf889b
| * | Remove LGPLv2 as a license option in configureLars Knoll2016-02-151-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | Instead show LGPLv3 and GPLv2 as valid options for the open source edition. Change-Id: Id7a203226428031ec873cbaf106dca14a854f155 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Remove unsued codeLars Knoll2016-02-181-130/+1
| |/ |/| | | | | | | | | | | | | | | | | This section did set some canBuild* variables based on compiler checks. Apart from canBuildQtConcurrent, the variables never got used. In the QtConcurrent case, the answer will anyway always be yes, since we require a c++11 compliant compiler nowadays. Change-Id: I660b40e96a657f6fa4d32f6b680adf44e70509c9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Better grouping of configure testsLars Knoll2016-02-161-111/+102
| | | | | | | | | | | | | | | | These tests are not required to build qmake, so move them together with the other tests. Change-Id: I191e7552e819e8d68a27da3ac1b5258d57145155 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Remove leftover from Symbian timesLars Knoll2016-02-161-6/+0
| | | | | | | | | | | | Change-Id: I8b61f327c038fa51935c9990adb8493f5477643f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Generalize iOS simulator and device exclusive buildTor Arne Vestbø2016-02-121-1/+1
|/ | | | | | | | Preparation for Apple tvOS support, which shares a lot with the iOS platform. Change-Id: I543d936b9973a60139889da2a3d4948914e9c2b2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-02-111-0/+6
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfilesystemwatcher_win.cpp src/corelib/plugin/plugin.pri src/plugins/platforms/cocoa/qcocoaaccessibility.mm tests/auto/corelib/tools/qlocale/tst_qlocale.cpp Change-Id: Id6824631252609a75eff8b68792e4d10095c8fc1
| * Link with -ldl option only when it is supportedLada Trimasova2016-02-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -ldl option was used unconditionally while libdl is not supported when libc is static. Add build test to configure which checks if libdl is supported. QMAKE_LIBS_DYNLOAD in "src/corelib/plugin/plugin.pri" is now used only if libdl is available. qt_linux_find_symbol_sys from qlibrary_unix is now used only if QT_NO_DYNAMIC_LIBRARY is not defined. Initially reported by Buildroot autobuilder here: http://autobuild.buildroot.net/results/a85/a85a1839a45fb6102e53131ecc8f6dadf92bcdc2 Change-Id: I0397472456efdc4f3ab5f24d01253bee8048a9d1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/devLiang Qi2016-01-261-3/+5
|\ \
| * | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-211-3/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qiodevice_p.h src/corelib/kernel/qvariant_p.h src/corelib/tools/qsimd.cpp src/gui/kernel/qguiapplication.cpp tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp Change-Id: I742a093cbb231b282b43e463ec67173e0d29f57a
| | * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2016-01-191-3/+5
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/common/atomic64/atomic64.cpp configure src/3rdparty/forkfd/forkfd.c src/corelib/io/forkfd_qt.cpp src/widgets/kernel/qwidgetwindow.cpp tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp tools/configure/configureapp.cpp Change-Id: Ic6168d82e51a0ef1862c3a63bee6722e8f138414
| | | * fix quoting in makeabs()Oswald Buddenhagen2016-01-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'local' is treated as a command, so its arguments need to be quoted, unlike in a real variable assignment. amends 4b557751e. Change-Id: I5a4c929e52e2344a6129c8e9dd4c0c80cd408ff0 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| | | * Auto-detect whether 64-bit std::atomic really worksThiago Macieira2015-12-041-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The C++ standard says it must, but some badly-configured toolchains seem to be lacking support. In particular, for some 32-bit platforms without native support for them, GCC implements 64-bit atomics via out-of-line functions in libatomic. If that library is missing... well, then std::atomic 64-bit doesn't work and we mustn't try to use it. This was found when trying to compile Qt 5.6 for MIPS 32-bit: Linking library libQt5Core.so.5.6.0 .obj/qsimd.o: In function `std::__atomic_base<unsigned long long>::load(std::memory_order) const': /opt/poky/1.7/sysroots/mips32r2-poky-linux/usr/include/c++/4.9.1/bits/atomic_base.h:500: undefined reference to `__atomic_load_8' .obj/qsimd.o: In function `std::__atomic_base<unsigned long long>::store(unsigned long long, std::memory_order)': /opt/poky/1.7/sysroots/mips32r2-poky-linux/usr/include/c++/4.9.1/bits/atomic_base.h:478: undefined reference to `__atomic_store_8' Yocto bug report: https://bugzilla.yoctoproject.org/show_bug.cgi?id=8274 Change-Id: I42e7ef1a481840699a8dffff140224d6614e5c36 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 3d7586b760550b7d89594c8d7462fc30b868ecc6) Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
| | | * Make -no-rpath build more useful on Apple platformsMartin Afanasjew2015-11-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Platform Specific Changes][OS X] Configure with -no-rpath will now yield Qt dynamic libraries and frameworks with an absolute install name (based in -libdir). OS X package managers like Homebrew install Qt in a fixed location. This change simplifies deployment for such package managers and is consistent with the default expectation on Apple platforms for libraries with a fixed location to also have absolute install names. While a relocatable installation (the default) also works in this scenario, it requires all software that depends on Qt to be aware of this and to embed a suitable RPATH into application binaries (which is not automatic for non-qmake builds). This might not be true for some select fallback search locations, but as package managers on OS X tend not to use those, embedding an RPATH becomes practically mandatory. In a default Homebrew installation, Qt is configured such that the frameworks end up in /usr/local/Cellar/qt5/<version>/lib and that will be later symlinked to /usr/local/opt/qt5/lib, both of which are not searched by the dynamic linker by default. Task-number: QTBUG-48958 Change-Id: I4395df98771e06a2ce8a293d11dc755bdc50757f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | | Updated license headersJani Heikkinen2016-01-211-18/+13
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I42a473ddc97101492a60b9287d90979d9eb35ae1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | write all properties to qt.conf when -external-hostbindir is usedOswald Buddenhagen2016-01-131-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the presence of a [Paths] section causes QLibraryInfo to derive all property values according to the Qt default directory layout, disregarding the compiled-in paths from configure. consequently, we need to write them all to qt.conf as well. Change-Id: I3558e9aef1fce956812ea91e216f53bf7934c285 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* | | write [Paths] to qt.conf only if -external-hostbindir is usedOswald Buddenhagen2016-01-131-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | there is no point in overriding the built-in defaults with the same values. Change-Id: I24f66b86f751f7044625b5256f3d979ece782cf7 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* | | Don't write absolute TargetSpec/HostSpec paths to qt.confTor Arne Vestbø2015-12-101-2/+2
| | | | | | | | | | | | | | | Change-Id: Ifc25a26c5e59a214bdd8dc9398b4d0047fbb5ca2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | configure: don't test AVX512 if AVX2 wasn't foundThiago Macieira2015-12-091-0/+3
| | | | | | | | | | | | | | | Change-Id: I14839ba5678944c2864bffff14176f0e9236ad8c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | fix copy&paste-o in HostVar error messageOswald Buddenhagen2015-12-011-1/+1
| | | | | | | | | | | | | | | Change-Id: Id70452d160d60c8f1defa10e163a8eba899e32ee Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Add qt_safe_pollLouai Al-Khanji2015-12-011-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is introduced to safely provide poll(2)-like semantics for socket multiplexing on Unix-like platforms. For platforms where no poll system call is available, an implementation based on select(2) is provided. Change-Id: I320e97dae5924316675a74d1897c48cae292ac6d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Merge remote-tracking branch 'origin/5.6' into devSimon Hausmann2015-11-271-2/+2
|\| | | | | | | | | | | Change-Id: Ib43c6f126998eefcfed9a7c1f2bcbac8b4dd05ec
| * | fix copy&paste-o in DeviceVar error messageOswald Buddenhagen2015-11-261-1/+1
| | | | | | | | | | | | | | | Change-Id: I2b7d95c004ce045527b124ef25b6d224535c895b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | Fix QT_CPU_FEATURESAllan Sandfeld Jensen2015-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The part of qmodule.pri that is supposed to set QT_CPU_FEATURES ends up missing in the output. Change-Id: I30f3dbad5ac22d32e25d63037980dac370adc4ea Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Configure with -system-harfbuzz by defaultKonstantin Ritt2015-11-261-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 4f8c75acbd75, we require HB>=0.9.42, which assumes multi-treading support. On OS X, -qt-harfbuzz is still required for AAT fonts support. Change-Id: I2a95b2c245a1eb2c580306ede7ee4eb0c7727317 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | | Remove remaining support for BlackberryLouai Al-Khanji2015-11-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The platform is no longer supported or actively maintained, and is in the way for improvements to the Unix event dispatcher and QProcess implementations. Change-Id: I3935488ca12e2139ea5f46068d7665a453e20526 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-11-181-15/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qprocess.cpp src/corelib/io/qprocess_unix.cpp src/network/kernel/qnetworkinterface_winrt.cpp tools/configure/configureapp.cpp Change-Id: I47df00a01597d2e63b334b492b3b4221b29f58ea
| * | introduce -optimized-tools optionOswald Buddenhagen2015-11-171-15/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of building host tools always in debug mode, follow the overall build type, and provide an option to override it. this supersedes the pre-existing -optimized-qmake option. however, that option never existed in the windows configure, and this legacy continues as far as qmake is concerned (msvc builds of qmake are always somewhat optimized, but not mingw builds). Change-Id: I42e7ef1a481840699a8dffff13fec2626af19cc6 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Port the Gtk platform theme to Gtk+ 3Dmitry Shachnev2015-11-131-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The major changes compared to the Gtk+ 2 version are: * Everything is ported to modern Gtk/Gdk API. * GtkFontChooserDialog is used instead of deprecated GtkFontSelectionDialog. * Hiding buttons on dialogs (like OK/Cancel) is no longer supported, as it is impossible to do that with dialogs using GtkHeaderBars. * Some workarounds were added to the QGtk3Theme constructor to correctly work with Gtk+ 3. [ChangeLog][Platform Specific Changes] The Gtk+ platform theme has been ported to Gtk+ 3. Change-Id: Iacb01279b6432e0901e3bb1353d5792543cc76e4 Done-with: J-P Nurmi <jpnurmi@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | | Fx the mysql configure test on RHEL 6.6Frederik Gladhorn2015-11-111-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | On RHEL 6.6, mysql_config --libs returns "-rdynamic" among other arguments. The configure test (config.tests/unix/mysql) would end up passing that to qmake. qmake responds with "***Unknown option -rdynamic ..." Change-Id: Ib1300e62aec8a5d866359f3eaea88d9648c872b9 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-11-041-13/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/ptrsize.test configure src/corelib/global/qnamespace.h src/network/socket/qabstractsocket.cpp tests/auto/other/networkselftest/networkselftest.pro Change-Id: Ic78abb4a34f9068567cea876861d4220f5a07672
| * | configure: add link-time-optimization optionPeter Kümmel2015-11-021-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | Windows' configure.exe supports -ltcg since several years, this patch adds -ltcg to Unix's configure script. Change-Id: I3f39086c67c3f4cacd252f63de30e3cfc4aa22bb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * | Support for Wayland servers on i.MX6Paul Olav Tvete2015-11-021-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | A wayland compositor on i.MX6 needs to create the wl_display before creating the EGL display. This wl_display then needs to be exposed so that QWaylandCompositor can use it. Change-Id: Id60f6dd2fbba05140ca0671da6f17dbc2ecce3a3 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
| * | Move pointer size detection entirely to qprocessordetection.hThiago Macieira2015-10-261-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit removes the legacy ptrsize check, which was deficient because it did not work for multiarch systems (when we supported fat OS X binaries) and did not work for bootstrap builds because the size might be different when cross-compiling. Instead, let's rely on the predefined preprocessor macros to detect correctly. As a nice side-effect, this fixes 64-bit Android builds cross-compiled from Windows. Task-number: QTBUG-48932 Change-Id: I1d0f78915b5942aab07cffff140f9a52b9342f23 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* | | Remove support for disabling C++11 support in configureThiago Macieira2015-11-041-47/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt now requires it. We could try and run the common/c++11 test for MSVC too, but we know it passes, so we won't bother and thus slow down the configure step. Change-Id: Ib056b47dde3341ef9a52ffff13ef6b53b9f8bb65 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Replace qdtoa and qstrtod implementation by a 3rdparty libraryUlf Hermann2015-11-021-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also fixes the underlying cause of QTBUG-44039 and QTBUG-43885. You can choose between system, qt, and no libdouble-conversion support. If you choose "no", snprintf_l and sscanf_l will be used. By default, system double conversion is used if the system provides a double-conversion library. Otherwise the bundled libdouble-conversion is built. sscanf_l and snprintf_l are not used by default as the planned "shortest" conversion mode to produce the shortest possible string will give less precise results when implemented with snprintf_l. Change-Id: I8ca08a0fca5c54cf7009e48e771385614f6aa031 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | configure: Separate host and build platform.David Schulz2015-10-301-19/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This separation makes it possible to make a canadian cross build of Qt on a linux build machine. The canadian cross build requires an external Qt that runs on the build system. Change-Id: Ifd83a4c6376d3299647e74bb349a3452a6f433fc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-231-94/+133
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf configure src/corelib/global/qglobal.h src/tools/qdoc/node.cpp src/tools/qdoc/qdocdatabase.cpp tests/auto/corelib/io/qsettings/tst_qsettings.cpp tools/configure/configureapp.cpp Change-Id: I66028ae5e441a06b73ee85ba72a03a3af3e8593f
| * | Add a deprecation warning to configure about -no-c++11Thiago Macieira2015-10-181-0/+14
| | | | | | | | | | | | | | | | | | | | | We'll remove it in Qt 5.7, so people ought to be notified now. Change-Id: Ib056b47dde3341ef9a52ffff13ef6caa91757a9f Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| * | configure: Open qconfig.h, qconfig.pri and qmodule.pri only onceThiago Macieira2015-10-181-80/+100
| | | | | | | | | | | | | | | | | | | | | Redirecting on every command is wasteful. Change-Id: I42e7ef1a481840699a8dffff1404fa0602805d1b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * | Move the official Qt version from qglobal.h to .qmake.confThiago Macieira2015-10-141-16/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | It's easier to parse than qglobal.h. The objective is actually to have macros with parts of the version number, so the major or minor numbers could be used in other preprocessor macros. Change-Id: I42e7ef1a481840699a8dffff1404eda1dd5c308d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | configure: fix log corruption with option -vBoris Nagaev2015-10-221-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug occurs if ./configure is called with -v on systems on which fd proc entries point to the files/devices they are open on instead of being magic nodes which would basically dup() the actual fds (e.g., Linux). In this case, the command "tee $tty" appends to /dev/stderr, which may be already opened by the parent process. This breaks the log file. Normally, the log file starts with This is the Qt Open Source Edition. ... but with `-v` flag it would start with output of awkprog and maybe some zero bytes. Zero bytes are observed on Debian Wheezy. DEFAULT_INCDIRS=... ... ^@^@^@^@^@^@^@^@^@^@^@^@... Done running configuration tests. ... To fix this problem, the output of `...` is saved to a variable, and then eval'd and echo'd (if -v). This solution was found by Tony Theodore. https://github.com/mxe/mxe/issues/938#issuecomment-149770348 Change-Id: Id0c28598890e813774cc92f38ee46a0697b34e77 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Fix avx512 feature testLouai Al-Khanji2015-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The check was broken on non-bash and producing errors like this: /home/louai/work/qt5/qtbase/configure: 4528: [: Illegal number: Change-Id: I5e78ad002cd7cfb401f2646510e0923f77c55f98 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Compile qmake and configure.exe in C++11 modeThiago Macieira2015-10-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since the Qt headers require them now, we need to ensure that happens properly. Change-Id: Ib306f8f647014b399b87ffff13f14196c2c75bef Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-141-34/+81
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/corelib/io/qfile/tst_qfile.cpp tests/auto/corelib/io/qprocess/tst_qprocess.cpp tests/auto/corelib/tools/qversionnumber/qversionnumber.pro Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e
| * | Separate KMS and GBM testsLaszlo Agocs2015-10-141-21/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KMS is no longer a platform plugin so the relevant leftover bits are now removed. As the introduction of the EGLDevice-based backend for eglfs shows, using DRM/KMS is not tied to GBM, separate buffer management approaches, like EGLStreams, work fine as well. Therefore separate KMS from GBM and remove the EGL and GLES dependency in the tests - this way there is nothing preventing us from using GBM without GL for example. Change-Id: Id7ebe172b44b315f9a637892237d2bb62d99aed2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
| * | Add support for the Jetson TK1 Pro using EGLDeviceLaszlo Agocs2015-10-141-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now we pick one crtc and find the corresponding layer. If this is not desired, set QT_QPA_EGLFS_LAYER_INDEX to override the layer to be used. Enable qt.qpa.eglfs.kms to get logs about the available layers. Change-Id: I762783f960739e32966c8cde17d8f55fbe40091f Done-with: Louai Al-Khanji <louai.al-khanji@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
| * | Distinguish between Objective-C and Objective-C++ sourcesTor Arne Vestbø2015-10-091-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of lumping both Objective-C (.m) and Objective-C++ (.mm) sources into the same pile, passing them on to the same compiler as for C++ (CXX), with the C++ flags (CXXFLAGS), we follow Apple's lead and treat them as variants of the C and C++ languages separately, so that Objective-C sources are built with CC and with CFLAGS, and Objective-C++ sources with CXX, and CXXFLAGS. This lets us remove a lot of duplicated flags and definitions from the QMAKE_OBJECTIVE_CFLAGS variable, which in 99% of the cases just matched the C++ equivalent. The remaining Objective-C/C++ flags are added to CFLAGS/CXXFLAGS, as the compiler will just ignore them when running in C/C++ mode. This matches Xcode, which also doesn't have a separate build setting for Objective-C/C++ flags. The Makefile qmake generator has been rewritten to support Objective-C/C++ fully, by not assuming that we're just iterating over the C and C++ extensions when dealing with compilation rules, precompiled headers, etc. There's some duplicated logic in this code, as inherent by qmake's already duplicated code paths, but this can be cleaned up when C++11 support is mandatory and we can use lambda functions. Task-number: QTBUG-36575 Change-Id: I4f06576d5f49e939333a2e03d965da54119e5e31 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
| * | Make -dbus-linked the default on all platformsThiago Macieira2015-10-011-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][QtDBus] The QtDBus library now links directly to the libdbus-1 system library if it was detected at configure time. To force linking to the library, pass option -dbus-linked to configure; to force dynamically loading at runtime, use -dbus-runtime. Task-number: QTBUG-14131 Change-Id: Ie33d1f22f85b465ab0ce166b8f17b8491eae1c21 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 08:18:29 +0000