summaryrefslogtreecommitdiffstats
path: root/configure
Commit message (Collapse)AuthorAgeFilesLines
* Compile QRegularExpression into qmakeLars Knoll2020-05-051-1/+12
| | | | | | | | This is required to be able to port qmake over to use QRegularExpression instead of QRegExp. Change-Id: I0ad2c19bf3c0a28e52c1e12b4d3daa0300a75ed2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-04-081-4/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/opengl/doc/src/cube.qdoc src/corelib/global/qlibraryinfo.cpp src/corelib/text/qbytearray_p.h src/corelib/text/qlocale_data_p.h src/corelib/time/qhijricalendar_data_p.h src/corelib/time/qjalalicalendar_data_p.h src/corelib/time/qromancalendar_data_p.h src/network/ssl/qsslcertificate.h src/widgets/doc/src/graphicsview.qdoc src/widgets/widgets/qcombobox.cpp src/widgets/widgets/qcombobox.h tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro tests/manual/diaglib/debugproxystyle.cpp tests/manual/diaglib/qwidgetdump.cpp tests/manual/diaglib/qwindowdump.cpp tests/manual/diaglib/textdump.cpp util/locale_database/cldr2qlocalexml.py util/locale_database/qlocalexml.py util/locale_database/qlocalexml2cpp.py Resolution of util/locale_database/ are based on: https://codereview.qt-project.org/c/qt/qtbase/+/294250 and src/corelib/{text,time}/*_data_p.h were then regenerated by running those scripts. Updated CMakeLists.txt in each of tests/auto/corelib/serialization/qcborstreamreader/ tests/auto/corelib/serialization/qcborvalue/ tests/auto/gui/kernel/ and generated new ones in each of tests/auto/gui/kernel/qaddpostroutine/ tests/auto/gui/kernel/qhighdpiscaling/ tests/libfuzzer/corelib/text/qregularexpression/optimize/ tests/libfuzzer/gui/painting/qcolorspace/fromiccprofile/ tests/libfuzzer/gui/text/qtextdocument/sethtml/ tests/libfuzzer/gui/text/qtextdocument/setmarkdown/ tests/libfuzzer/gui/text/qtextlayout/beginlayout/ by running util/cmake/pro2cmake.py on their changed .pro files. Changed target name in tests/auto/gui/kernel/qaction/qaction.pro tests/auto/gui/kernel/qaction/qactiongroup.pro tests/auto/gui/kernel/qshortcut/qshortcut.pro to ensure unique target names for CMake Changed tst_QComboBox::currentIndex to not test the currentIndexChanged(QString), as that one does not exist in Qt 6 anymore. Change-Id: I9a85705484855ae1dc874a81f49d27a50b0dcff7
| * Pass SDK root to the linker as -isysroot, not -Wl,-syslibrootTor Arne Vestbø2020-04-021-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The former option to clang will result in more options to the linker, such as the newly introduced -platform_version, which writes the SDK version to the resulting binary. By using the syslibroot flag directly we were missing the platform version, and binaries were left without an SDK version set, resulting in failed validation of the binary. Going with the clang driver gives us the right behavior for free. Fixes: QTBUG-83100 Change-Id: I98bc9ba644dae4bcc7a6a88481556bae185ce5fa Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 6a60192ac03d0b4ab542191065122243cebcd1ca) Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | Add convenience forwards/translations to cmake configure wrapperSimon Hausmann2020-04-011-0/+9
| | | | | | | | | | | | | | | | | | Translate --ccache and --sanitize=foo into corresponding cmake variables. Change-Id: If6e20a715ace7e55e498e3398c592295a4f264c3 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Use C++17 for qmake and force the build of everything with C++17Olivier Goffart2020-02-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | We will want to use C++17 code in our headers soon. (including the one in the bootstrap libraries) This patch is quick and dirty, I guess it will be cleaner once we move to cmake Updated QMAKE_MACOSX_DEPLOYMENT_TARGET because 10.13 runtime does not support C++17 stdlib features Change-Id: I75ac171436945dddd1bb953a9c8d323ac20da7ac Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | configure: Add support for -feature and -no-feature for cmake buildsVille Voutilainen2020-01-291-0/+10
| | | | | | | | | | Change-Id: I160a9513da0401f1c83598691294ec48737e08a5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/dev' into merge-devLeander Beernaert2020-01-241-2/+1
|\ \ | | | | | | | | | Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739
| * \ Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-251-2/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qhash.h src/gui/kernel/qevent.h src/widgets/kernel/qshortcut.cpp src/widgets/kernel/qshortcut.h Change-Id: If61c206ee43ad1d97f5b07f58ac93c4583ce5620
| | * Android: remove remaining reference to -android-toolchain-versionMitch Curtis2019-11-181-2/+1
| | | | | | | | | | | | | | | | | | | | | This amends 65dfc485adc1c5de4840f217c47c6ad79d26ae82. Change-Id: I5e0ec7632befe0650138d1977d42313dc0acf3bf Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | Prospective fix for Boot2Qt build in the CISimon Hausmann2019-10-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the parameters that Coin passes to configure is this: -device-option DISTRO_OPTS="hard-float boot2qt" The configure script would "swallow" the quotes and end up calling qmake with -device-option DISTRO_OPTS=hard-float boot2qt, causing qmake to complain that the standalone "boot2qt" option is unknown. Fix this by preserving the quotes in the forwarding helper functions. Change-Id: I16098bd35acb579ebf183b0f7746af8758269e7c Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-10-141-1/+0
|\ \ \ | |/ / | | | | | | Change-Id: I4a78428a8ea273b6960792e3b8043f816fa37fcf
| * | Remove leftovers from QML1Lars Knoll2019-10-101-1/+0
| |/ | | | | | | | | | | | | QML1 is not supported anymore, remove the leftover hooks for it. Change-Id: I2900726714c5faea3523b2ebe39bb393364b3bfb Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Restore top-level build with a separate functionVille Voutilainen2019-10-071-14/+19
| | | | | | | | | | | | | | | | | | We have other helper functions like this, and the way they are made to work is to pass the script's arguments down to them. Change-Id: I3b80e82a2fb3d6e6a65b2deca3b60e4e0dd8de07 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Fix top-level builds with qmakeSimon Hausmann2019-09-231-16/+14
| | | | | | | | | | | | | | | | | | | | | | The separation of functionality into functions in commit 37756ede09402931758efc51072147a3ea73d961 accidentally broke top-level builds as the function to detect -top-level was operating on local parameters (shift) or they were not available ($1). Inlining these few lines fixes it. Change-Id: Icf609dc5e7b361997847f3ef3a1b10635c122d5d Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* | cmake: configure defaults to ninja, support -developer-modeVille Voutilainen2019-09-111-0/+20
| | | | | | | | | | | | | | | | This makes -developer-mode build tests and examples, too. Change-Id: I3f1a700c6e9d06ab632990561e13f059acb4e6ff Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge branch 'wip/qt6' into wip/cmakeAlexandru Croitor2019-08-151-1/+1
|\ \ | |/ | | | | Change-Id: I50ac36b8803c296998149e98cc61e38687cdd14b
| * Fix typo in configure scriptTasuku Suzuki2019-07-241-1/+1
| | | | | | | | | | Change-Id: Icc979dd58e061c62d45305e00580d27d0cd4af69 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Teach configure to run either qmake or cmakeVille Voutilainen2019-05-161-26/+141
|/ | | | | | Task-number: QTBUG-74139 Change-Id: I609ec4b3ef9f30455bd72aaebad0b6c766c39cd7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* configure: Treat win32-clang-g++ the same as win32-g++Martin Storsjö2018-10-101-1/+1
| | | | | | | This fixes configure with win32-clang-g++ as the native compiler. Change-Id: Iced43d70b9a0aa413d1f5f6034b42b976cb7c39e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* configure: Detect Cocoa instead of CarbonGabriel de Dietrich2018-04-051-1/+1
| | | | | | | Change-Id: I9d1ff47481ad450b4b57c82e15186657eb7dcf93 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Remove references to obsolete platformsJake Petroules2017-11-051-4/+0
| | | | | | | | | | | | | | ultrix and reliant have not seen a release since 1995. dgux not since 2001. bsdi not since 2003. irix not since 2006. osf not since 2010. dynix... unclear, but no later than 2002. symbian needs no mention. All considered obsolete, all gone. sco and unixware are effectively obsolete. Remove them until someone expresses a real need. Change-Id: Ia3d9d370016adce9213ae5ad0ef965ef8de2a3ff Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* configure: dispose of which.testOswald Buddenhagen2017-08-021-3/+1
| | | | | | | | | just use 'which' and be done with it. the script was rather arcane, and worked around deficiencies of cygwin (no longer relevant) and solaris (assumed to be somewhat sane meanwhile). Change-Id: I2e11ea3c87ac06a85604ac8d58d8fee95eae2e15 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Allow using Xcode Command Line Tools to build QtJake Petroules2017-06-291-9/+14
| | | | | | | | | | | | | | Some users don't want to download the full Xcode installation which can weigh upwards of 5 GB download and 20 GB installed. [ChangeLog][macOS / iOS] Qt can now be built using just the Xcode Command Line Tools, without needing to install the full Xcode IDE. Task-number: QTBUG-35928 Task-number: QTBUG-41908 Change-Id: I6d13c9a03ab9087b3ab56e8547f53f0cc2806c7b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Clean up mkspecs from old, unsupported and untested mkspecsThiago Macieira2017-04-271-64/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They have not been tested with Qt 5, not even once to make sure that the mkspec passes the sanity check. This removes for OSes: HP-UX (running on PA-RISC -- Itanium still supported) SGI IRIX SCO Unix Tru64 Unix Unixware And compilers: IBM xlC (Visual Age C++) HP aCC compiler (PA-RISC and Itanium) PGCC, cxx and kcc on Linux There were a couple more OSes detected in the configure script that were lacking even the mkspec. Those have also been removed. Of those, only hpuxi-acc and aix-xlc have been tested in the last 9 years, though only with Qt 4 and never tried with C++11 support. IRIX was last tested over 10 years ago and PA-RISC is definitely not supported due to its lack of atomic operations. Support for HP-UXi and AIX is now only possible with GCC (assuming GCC supports those). Support files for Oracle's Sun Studio compiler are left behind, but its state is unknown. Change-Id: I7814054a102a407d876ffffd14b69c796b97c972 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* configure: balk at any of {{,X}QMAKESPEC,QMAKE{PATH,FEATURES}} being setOswald Buddenhagen2017-04-211-0/+9
| | | | | | | | | | | these variables have no legitimate use when building qt itself, but have great potential to wreak havoc. Task-number: QTBUG-60016 Change-Id: I161837463443af82d48145e75952fa529212fe75 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* complain about various invalid configuration attemptsOswald Buddenhagen2017-01-061-0/+5
| | | | | | | Task-number: QTBUG-56049 Change-Id: Id5eeb014c2b88195d2d14566a62dcb9185206b37 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* don't unnecessarily pass -qtconf to qmakeOswald Buddenhagen2017-01-061-4/+5
| | | | | | | | | it makes the call more noisy for no particular reason. and the new code is even easier to read ... Change-Id: Ib4dfd373f351eeaca99e6bfc42b631f931ec987d Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* move emission of final messages to qmake-based configureOswald Buddenhagen2017-01-061-77/+20
| | | | | | | | | | | | | now qmake is the last command called by the unix configure script. as it happens, this was already the case in the windows script, but only because it didn't print these messages at all, which it implicitly does now. another effect of this is that repositories outside qtbase will now also get the installation note in modular builds, which makes sense. Change-Id: I567146936b216185a8e0f61e445222215608bf13 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* print help from all modules in top-level buildsOswald Buddenhagen2016-12-301-0/+10
| | | | | | | | | this is rather hacky. a proper solution would auto-generate help from the command line argument definitions, at the cost of needing to bootstrap qmake first. Change-Id: Iada6e25d5b31d7db0595309887f2d13295bbc1e3 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* move all target spec handling to qmake-based configure systemOswald Buddenhagen2016-12-131-97/+2
| | | | | | | | | | | | | we pull this feat off by booting configure with a dummy spec. the proper spec gets loaded subsequently. note that it was necessary to move the cache loading after processing the early checks (from which the spec handling is triggered). this is just fine, as the cache is needed only by tests, which are forbidden at this stage by definition. Change-Id: I5120e25a8bf05fb8cc5485fd93cf6387301089aa Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* move qdevice.pri creation to qmake-based configure systemOswald Buddenhagen2016-12-131-156/+1
| | | | | | | Change-Id: I06540c3b6d98303bd9a218feedfb529993477ed6 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* move generation of qconfig.cpp (and qt.conf) to qmake-based configureOswald Buddenhagen2016-12-131-417/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | this moves us another step towards the "outer" configure doing just minimal bootstrapping of qmake. a challenge here was that so far, qmake itself needed qconfig.cpp. this was replaced by usage of a qt.conf file instead of compiled-in values. however, to make the executable still self-contained, that qt.conf is embedded into it (by simple appending of a fixed signature and the text file). the qmake with the embedded qt.conf is not used for the qt build itself, which instead relies on the qt.conf in bin/ as before. however, due to the missing built-in values, this file now needs to contain more information than before. but except for a minimal version that is needed to start up qmake/configure at all, that file is now also generated with qmake. as some of the newly set up properties are subsequently used by configure itself, qmake gains a (deliberately undocumented) function to reload the qt.conf after it's fully populated. unlike the old implementations, this one doesn't emit redundant qt.conf entries which match the hard-coded fallbacks. omitting them leads to leaner files which are more comprehensible. Started-by: Paolo Angelelli <paolo.angelelli@qt.io> Change-Id: I4526ef64b3c89d9851e10f83965fe479ed7f39f6 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* nuke configure -host-optionOswald Buddenhagen2016-12-131-38/+4
| | | | | | | | | | | | | | | in its current form, it was introduced only in 5.7, mostly as a side effect of -external-hostbindir (which is now handled differently). it only ever worked for the macOS and MinGW specs, as a side effect of them supporting -sdk and -device-option (for good reasons), and was supported only by the unix configure. it's not believed to be really useful and complicates matters somewhat, so get rid of it again. should it ever become actually relevant, it can be re-introduced properly, probably along with a -host-sdk option for macOS. Change-Id: Ib078469ea39deb821c7b6a8c67fda9e1a95fedf5 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* write HOST_QT_TOOLS to qmodule.pri instead of qhost.priOswald Buddenhagen2016-12-131-1/+0
| | | | | | | its only consumer is qt_tool.prf, which is an internal api. Change-Id: Iae90b079c5af60efad2ded70d6ea481212e5353a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* don't scope QMAKE_MAC_SDK assignment in qdevice.pri any moreOswald Buddenhagen2016-12-131-9/+3
| | | | | | | host builds are using qhost.pri since c23a086e4. Change-Id: I312a7fdbdf8a392d74905d52d02bcb77459063cc Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* move configure -redo handling (mostly) to qmake-based systemOswald Buddenhagen2016-12-131-52/+3
| | | | | | | | | the qmake bootstrap uses some of the options, so the configures still read config.opt for their own purposes, but the general handling is entirely in the new system now. Change-Id: I2c6c657d4da01c8d520ac74795454747bb224bdd Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* move preparation of configure test build dir to qmake-based systemOswald Buddenhagen2016-12-131-5/+0
| | | | | Change-Id: I650fb92cfa858bf6d7ff5756aa0efe182f036a55 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* move license check to qmake-based configure systemOswald Buddenhagen2016-12-081-186/+9
| | | | | | | | | | | | | this also removes the need for passing pre-processed options via configure.cfg, so get rid of that. a somewhat unfortunate side effect is that the android-style-assets feature had to move back to the top level, as the licensing options depend on it. Started-by: Lars Knoll <lars.knoll@qt.io> Change-Id: Id4d1e0ba18b3e3104400293b8f0c7f2f65e68dea Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* configure: put more of the makefile contents into template filesOswald Buddenhagen2016-11-231-59/+15
| | | | | | | ... instead of having (duplicated) code in the configures to create it. Change-Id: Ia86b44021a024a969f5a49b7fb18d3d414869f93 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* configure: delete some dead code and outdated commentsOswald Buddenhagen2016-11-231-38/+3
| | | | | Change-Id: I764a9b383176e1fe9573790547ce0e12d1f88261 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* configure: don't read QMAKESPEC from the environmentOswald Buddenhagen2016-11-231-1/+1
| | | | | | | | | it was rather unexpected that this was done, entirely inconsistently with how the rest of the configure parameters are handled. Task-number: QTBUG-52266 Change-Id: I6e1d7a4fe1c85d6d64d465517b6be3f3cdda3359 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-161-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/linux-android.conf src/gui/opengl/qopengl.h src/network/socket/qnativesocketengine_winrt.cpp src/network/socket/qnativesocketengine_winrt_p.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/eglfs/api/qeglfsintegration.cpp src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp sync.profile Change-Id: If70aaf2c49df91157b864cf0d7d9513546c9bec4
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-151-3/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/plugins/platforms/eglfs/qeglfsintegration.cpp src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp Change-Id: Id2da7c775439adb62646d5b741ee7c638042b34b
| | * fix wording issues in license promptOswald Buddenhagen2016-11-141-4/+4
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-42136 Change-Id: Ie4ff1b38af6e7a74490558e80a0e559fee8a5486 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-291-1/+5
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: configure src/plugins/platforms/winrt/qwinrtclipboard.cpp Change-Id: Ic6d58be3d1ed2bb507f2ba06c82361afd9f9ddb9
| | * Pass no-pkg-config to qmake from config.test if appropriateMike Krus2016-08-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On macOS, even if pkg-config is present in the path, configure will by default correctly ignore it and set no-pkg-config. However, this was not propagated to qmake when invoked from config.test, so tests which rely on that did not work. This was leading to pkg-config (installed from homebrew) to be used in the libpng test, so it succeeded. But the later Qt build would fail to find png.h from homebrew, as it correctly ignores pkg-config. Task-number: QTBUG-55011 Change-Id: Ic6fb866bea0551f528da56cb545174dcd9bacf0d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Mike Krus <mike.krus@kdab.com>
| | * Fix the mysql configure test on RHEL 6.6Frederik Gladhorn2016-08-251-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> (cherry picked from commit d7e27e4d26b5359a60ab5acd89ffcc6b42e974b0) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Mike Krus <mike.krus@kdab.com>
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-251-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/mimetypes/qmimeprovider.cpp src/corelib/mimetypes/qmimetype.cpp Change-Id: Ib483ddb6bfc380e7c8f195feca535703814c3872
| | * configure: Correctly detect clang's version on FreeBSDRaphael Kubo da Costa2016-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "clang -v" on FreeBSD reports something like "FreeBSD clang version x.y.z [...]" instead of just "clang version x.y.z [...]", which fails to match the sed pattern in the configure script, resulting in qconfig.pri having no clang version defined. Augment the pattern so that both version strings match. Change-Id: I5f38f8480f4b1156ca7147e32c1157a009557035 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | qmake: fix /dev properties with -external-hostbindirOswald Buddenhagen2016-11-151-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | if the externally provided qmake had a different on-device install tree layout, things would go wrong. of course, that's a rather unlikely case, so nobody noticed ... Change-Id: I59f9976a769ccb6099b7237ef42555f0549615aa Reviewed-by: Lars Knoll <lars.knoll@qt.io>