summaryrefslogtreecommitdiffstats
path: root/configure.pri
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.11' into 5.12Liang Qi2018-09-101-0/+2
|\ | | | | | | | | | | | | Conflicts: mkspecs/common/macx.conf Change-Id: I8576493b417912fa5e5501bc2c1b935d186ac209
| * macOS: Warn the user when using incompatible or untested platform SDKsTor Arne Vestbø2018-08-311-0/+2
| | | | | | | | | | | | Task-number: QTBUG-70263 Change-Id: Ic946d1efc69ebb8ba65bbba956ed55ab7183957e Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | Android: Default to android-21 NDK for arm64-v8aEskil Abrahamsen Blomfeldt2018-09-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | The earlier NDK platforms do not support 64 bit architectures, so configure would fail with a confusing message about problems in the environment. [ChangeLog][Android] Default to android-21 for arm64 builds instead of failing. Task-number: QTBUG-70280 Change-Id: Ib9846d6deee3d453fd4a17a3ae92306482d380ba Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | WebAssembly for QtBaseMorten Johan Sørvig2018-08-301-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | This is the squashed diff from wip/webassembly to dev. Done-with: Peng Wu <peng.wu@intopalo.com> Done-with: Sami Enne <sami.enne@intopalo.com> Done-with: Morten Johan Sørvig <morten.sorvig@qt.io> Started-by: Andrew Knight <andrew.knight@intopalo.com> Change-Id: I6562433c0a38d6ec49ab675e0f104f2665f3392d Reviewed-by: Lorn Potter <lorn.potter@gmail.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | qmake: add default path and version detection for ghs toolchainOswald Buddenhagen2018-08-171-0/+6
| | | | | | | | | | | | | | Change-Id: Ic35f3e25078909e212864218835663989f647aae Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Nikola Velinov <nvelinov@ghs.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge branch '5.11' into devEdward Welbourne2018-07-311-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/library/qmakebuiltins.cpp src/plugins/platforms/windows/qwindowstabletsupport.h src/plugins/platforms/xcb/qxcbconnection.cpp src/plugins/platforms/xcb/qxcbconnection.h src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/plugins/platforms/xcb/qxcbwindow.cpp src/widgets/styles/qstylesheetstyle.cpp tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp Done-With: Gatis Paeglis <gatis.paeglis@qt.io> Change-Id: I000b0eb3cea2a5c7a99b95732bfdd41507cf916e
| * qmake: skip license check while building qtOswald Buddenhagen2018-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure already does it for qt itself, so it's pointless to ever invoke in default_pre.prf. to make the exclusion work during the makespec reload during early setup, we pull ahead the restoration of CONFIG, hoping it won't cause too many side effects. another change in qt5 will ensure that top-level builds are also covered. finally, configure tests also need an explicit exclusion. that way, attempts to re-configure build trees of commercial builds after the day of the first configuration do not fail anymore. Task-number: QTBUG-63452 Change-Id: I42264f64d7621784d4d67bde885a8e501f5ca413 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * configure: Fix QMAKE_* variable assignments containing numbersAlistair Buxton2018-07-201-1/+1
| | | | | | | | | | | | | | | | | | 9fde78269 fixed overrides for library definitions, but failed to fix direct overrides of variables from mkspecs, like QMAKE_LIBS_OPENGL_ES2. Task-number: QTBUG-69176 Change-Id: I818acf25f581903c323847382ec6baab38b64330 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-171-0/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbintegration.cpp Conflicts git missed: src/plugins/platforms/qnx/qqnxglcontext.cpp Change-Id: I0582cdc9e66e43efe79038b9c43d4f9572ac88fc
| * configure: pull ahead gcc-sysroot processingOswald Buddenhagen2018-07-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | the sysroot flags need to be established even before setting up the spec, because as soon as that happens, toolchain.prf will try to determine the default paths and cache them. this also fixes sysroot use in toolchain flag support tests, which run (somewhat) independently from the toolchain setup. Task-number: QTBUG-63483 Change-Id: I7be1540e766dac58fb16f63176aa8d2879b51ae0 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | configure: move qtConfTest_verifySpec() out of qt_configure.prfOswald Buddenhagen2018-07-101-0/+5
| | | | | | | | | | | | | | | | | | | | the callback is specific to qtbase/configure.json, so it belongs into qtbase/configure.pri. amends d90db0f136. Change-Id: I905f985e2d3d2e42c4587cbacdea8dc3eb09a5be Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-07-021-7/+11
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/cocoa/qnsview.mm src/plugins/platforms/cocoa/qnsview_dragging.mm src/plugins/platforms/ios/qiosinputcontext.mm src/plugins/platforms/xcb/qxcbconnection.cpp src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/plugins/platforms/xcb/qxcbwindow.cpp src/tools/androiddeployqt/main.cpp Was moved from qttools into qtbase in 5.11. So re-apply 32398e4d here. tests/auto/corelib/global/qlogging/test/test.pro tests/auto/corelib/global/qlogging/tst_qlogging.cpp tests/auto/corelib/io/qfile/tst_qfile.cpp tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp tests/auto/corelib/thread/qthreadstorage/test/test.pro tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp tests/auto/widgets/kernel/qapplication/test/test.pro Done-with: Gatis Paeglis <gatis.paeglis@qt.io> Done-with: Mårten Nordheim <marten.nordheim@qt.io> Done-with: Oliver Wolff <oliver.wolff@qt.io> Change-Id: Id970486c5315a1718c540f00deb2633533e8fc7b
| * Replace commercial preview license with Qt License Agreement 4.0Kai Koehne2018-06-211-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do allow people to build from git using the Qt License Agreement 4.0. The license agreement text is the same as in the installers, except that some Unicode characters got normalized to their ASCII variants, and things have been properly wrapped. [ChangeLog][Licensing] The commercial preview license in the git checkout has been replaced by the Qt License Agreement 4.0 text. This makes it explicit that commercial customers of The Qt Company can use the git version under commercial terms. However, support is (still) only provided for builds from released branches of Qt. Task-number: QTBUG-52222 Change-Id: I9e99b68e236a09610b798ba7a841e5a9d1ce6898 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | configure: centralize shell-quoting of tests' .literal_args fieldOswald Buddenhagen2018-05-081-1/+1
|/ | | | | | | | this de-noises the code somewhat, and makes it possible to eval() the code generated by $$qtConfLibraryArgs(), which we want to do later. Change-Id: Ib6101c6745101801e34f8fab1ad6651e624130c7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Configure: Restore default prefix on WindowsOrgad Shaneh2018-04-091-3/+7
| | | | | | | | | The configure unification accidentally changed it to /usr/local as used on unix. Use C:/Qt again. Task-number: QTBUG-61373 Change-Id: I758c639bdb07c97b55f990821e73a5135038f4a0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* configure: introduce 'subarch' term to expression evaluatorOswald Buddenhagen2018-02-221-9/+6
| | | | | | | | | | | ... and make use of it. it's a logical continuation of the 'arch' term, and will be used also in qt3d's configure. Started-by: Thiago Macieira <thiago.macieira@intel.com> Change-Id: I940917d6763842499b18fffd1514c96889a0cc63 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Merge remote-tracking branch 'origin/5.10' into devLars Knoll2018-01-021-1/+14
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf sc/corelib/io/qfsfileengine_p.h src/corelib/io/qstorageinfo_unix.cpp src/platformsupport/eglconvenience/qeglpbuffer_p.h src/platformsupport/input/libinput/qlibinputkeyboard.cpp src/platformsupport/input/libinput/qlibinputpointer.cpp src/plugins/platforms/cocoa/qcocoamenu.mm src/plugins/platforms/ios/qiosscreen.h src/plugins/platforms/ios/qioswindow.h src/plugins/platforms/ios/quiview.mm src/printsupport/dialogs/qpagesetupdialog_unix_p.h src/printsupport/dialogs/qprintpreviewdialog.cpp src/printsupport/widgets/qcupsjobwidget_p.h src/widgets/widgets/qmenu.cpp tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp Change-Id: Iecb4883122efe97ef0ed850271e6c51bab568e9c
| * Merge remote-tracking branch 'origin/5.9' into 5.10Lars Knoll2017-12-301-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf mkspecs/win32-g++/qmake.conf src/corelib/global/qglobal_p.h src/corelib/global/qoperatingsystemversion_p.h src/corelib/io/qfilesystemengine_win.cpp src/network/bearer/qbearerengine.cpp src/platformsupport/input/libinput/qlibinputpointer.cpp src/sql/doc/snippets/code/doc_src_sql-driver.cpp src/widgets/kernel/qwidget_p.h src/widgets/kernel/qwidgetwindow.cpp src/widgets/styles/qfusionstyle.cpp tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp Change-Id: I80e2722f481b12fff5d967c28f89208c0e9a1dd8
| | * Android: Fix note for host architecture mismatchEskil Abrahamsen Blomfeldt2017-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The qtConfAddNotice was a typo, so this note was missing from config.log and the build would fail with no explanation. Change-Id: Iae22f92c1ba6bdf96d41a7cc608b9aedd6863b1f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * | Export sanitizer as a global configAlexandru Croitor2017-12-181-0/+13
| |/ | | | | | | | | | | | | | | | | | | This is necessary for WebEngine at configure time, to be able to query which of the sanitizers was enabled in order to report unsupported combinations. Task-number: QTBUG-64726 Change-Id: I72f8efe4bed3e14114f885bdae16650f1f23b24b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Centralize the x86 SIMD testing in one placeThiago Macieira2017-11-301-3/+13
| | | | | | | | | | | | | | | | Since the x86_simd/main.cpp file already has all the source for each and every test anyway, just reuse it. Change-Id: I938b024e38bf4aac9154fffd14f779f450827fb9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Add a configure-time check for QT_COMPILER_SUPPORTS_SIMD_ALWAYSThiago Macieira2017-11-301-0/+13
|/ | | | | | | | | | | | | | | | This has two main benefits: 1) introduces a qmake CONFIG we can use in .pro/.pri/.prf files 2) removes the need to keep an up-to-date list of which compilers support the feature The test is implemented as trying to compile every single SIMD test we currently have, but without passing the -mXXX option. The reason for trying all of them is that some people may have modified their mkspecs to add -mXXX options or -march=XXX, which could enable the particular feature we tried, resulting in a false positive outcome. Change-Id: I938b024e38bf4aac9154fffd14f7784dc8d1f020 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Append the QMAKE_EXTRA_ARGS to the output instead of overwriting itAndy Shaw2017-08-251-1/+1
| | | | | | | | | | When QMAKE_* variable assignments were passed to the configure line they would cause the current contents of the private pro output to be overwritten. This would cause anything added to it before the QMAKE_* variable assignments to be parsed to be lost. Change-Id: Idcb8cad5f07cbb96b4da204384f5618b95b375b0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* build the configure tests in the top-level build dirOswald Buddenhagen2017-06-121-1/+1
| | | | | | | | | | there isn't really a point in doing strict shadow builds of them, and it complicates stand-alone building of sub-projects (because it points below the build root). Task-number: QTBUG-58372 Change-Id: Ia3bde3826baac44749b27452fd4aeb9491ecb94e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* make qconfig.pri export QT_<compiler>_VERSION variables againOswald Buddenhagen2017-06-121-0/+31
| | | | | | | | | | | | | ... and rename those determined by toolchain.prf to QMAKE_* (this was already the case for the newly introduced msvc and icc variables). this restores the ability for user projects to query the toolchain qt itself was built with, which is necessary for compatibility checks. in fact, we may do such validation in toolchain.prf itself at a later point. Change-Id: I35f4c393c5e4e0fe987c0844714b7a8f8687c24e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* fix licheck calls on 32 bit systemsOswald Buddenhagen2017-05-311-1/+1
| | | | | | | | | | | $$QMAKE_HOST.arch isn't very well defined for ia32 - on windows it's x86, on linux it may be anything from i386 to i686. test for != x86_64 instead. Task-number: QTBUG-61044 Change-Id: I8f3267b404fffbf479d87bee2e8ee8c6cd404b50 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* don't redirect licheck's stderrOswald Buddenhagen2017-05-311-1/+1
| | | | | | | | it uses it for interaction. Task-number: QTBUG-61017 Change-Id: I9edc0f9aa91793bc451fa78a8f6ad11d61e04b57 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* quote the confirm-license argument of licheckOswald Buddenhagen2017-05-311-1/+1
| | | | | | | | it can be (and usually is) empty (if the option was not used), which would make it disappear from the command line. Change-Id: Ic682e92a0d20cf849fade8449ebd79a5aa424d21 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Fix target ABI configure detectionSimon Hausmann2017-05-021-2/+3
| | | | | | | | | | Amend commit e6bf2376697975313b7ccd3f9bcebb869bb0b04c to correctly cache the abi in config.cache and set QT_BUILDABI to the correct target ABI when cross-compiling. Task-number: QTBUG-60441 Change-Id: I4ebfce9d6266be2a3225034fbf3aff08e7fdc5d5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* unbotch licheck output processingOswald Buddenhagen2017-04-281-1/+7
| | | | | | | | | | | instead of calling eval() on the entire output, loop over it line by line, because: - the first line is a message, not a variable assignment - eval() can process only one statement at a time Task-number: QTBUG-60255 Change-Id: Idca652910c8f2c852372d486c51c8554bc708dcf Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Make build ABI available as qmake variableSimon Hausmann2017-03-281-2/+10
| | | | | | | | | | This is needed to encode the correct ABI into the generated qml caches. It is identical with the return value of QSysInfo::buildAbi(). Change-Id: I2d581b22326da4220f412ab4f517156f4ba31897 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-131-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/network/network.pro mkspecs/features/mac/default_post.prf src/corelib/io/qfilesystemengine_win.cpp src/corelib/io/qprocess.cpp src/corelib/io/qprocess.h src/corelib/io/qprocess_p.h src/corelib/io/qprocess_unix.cpp src/corelib/io/qprocess_win.cpp src/corelib/thread/qmutex.cpp src/platformsupport/fontdatabases/windows/windows.pri src/plugins/platforms/eglfs/eglfsdeviceintegration.pro tests/auto/corelib/io/io.pro Change-Id: I8a27e0e141454818bba9c433200a4e84a88d147e
| * make an effort to keep /src properties constantOswald Buddenhagen2017-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | writing $$PWD (via $$QT_SOURCE_TREE) into the new bin/qt.conf would potentially change the path compared to the value originally written by the configure script, as $$PWD is canonicalized. this in turn would break the magic for delaying the loading of toolchain.prf. so instead just write out the perfectly fine current value of $$[QT_INSTALL_PREFIX/src]. amends 169a40d51, thereby fixing 6834d0eec on windows. Task-number: QTBUG-58816 Change-Id: Ibbd44df8f3c825a97d9f4acb869e44c93acb835b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-02-081-15/+15
|\ \ | |/ | | | | | | | | | | | | Conflicts: configure.json mkspecs/win32-icc/qmake.conf Change-Id: Ibf40546b024d644c7d9ed490bee15b82597f4d3f
| * Remove outdated check for Apple Clang 2.x and 3.xThiago Macieira2017-02-081-12/+0
| | | | | | | | | | | | | | The minimum version of Xcode that we support is 5.1 (based on Clang 3.4) Change-Id: I536c32a88bff44dab37afffd14a11f709fb25169 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * adjust configure to native build optimizationsOswald Buddenhagen2017-02-061-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't fail to set up cross_compile early enough. otherwise, we'd populate the cache for target builds with data for the host. amends 6b8666c7 and 5060740f. conversely, pass on extra flags to configure tests when not cross building. amends d8be8110 (and 2c5eb3e6). Task-number: QTBUG-58556 Change-Id: I531d71e06204a0b17ae6dabf017a52e0f2efd9a7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * make more use of configure QMAKE_*= arguments in native buildsOswald Buddenhagen2017-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | don't ignore the variable assignments for host tools when we're not actually cross-building. (sort of) amends 5060740f. Task-number: QTBUG-58511 Change-Id: Ideda25fb18a4e0b2d54179b08b6301b94a48e51c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Fix MIPS DSP configurationAllan Sandfeld Jensen2017-01-271-2/+3
| | | | | | | | | | | | | | | | | | The patch fixes a number of bugs in code, and removes dead logic clarifying that MIPS DSP, like ARM NEON, has no runtime detecton. Change-Id: If2f4eea68da5b2eaa80b8e9c8258206d8c1b7173 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-251-86/+61
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf mkspecs/common/msvc-desktop.conf mkspecs/common/msvc-version.conf mkspecs/common/winrt_winphone/qmake.conf mkspecs/features/mac/default_post.prf mkspecs/features/mac/sdk.prf mkspecs/features/qt.prf mkspecs/features/uikit/default_post.prf mkspecs/features/winrt/default_pre.prf mkspecs/winphone-arm-msvc2013/qmake.conf mkspecs/winphone-x86-msvc2013/qmake.conf mkspecs/winrt-arm-msvc2013/qmake.conf mkspecs/winrt-x64-msvc2013/qmake.conf mkspecs/winrt-x86-msvc2013/qmake.conf qmake/generators/win32/msvc_vcproj.cpp src/gui/kernel/qwindowsysteminterface.cpp src/network/kernel/qhostaddress.cpp src/plugins/platforms/mirclient/qmirclientplugin.cpp src/plugins/platforms/mirclient/qmirclientplugin.h src/widgets/util/qsystemtrayicon.cpp tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp tools/configure/Makefile.mingw tools/configure/Makefile.win32 Done-with: Jake Petroules <jake.petroules@qt.io> Done-with: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Change-Id: I4be3262d3994e11929d3b1ded2c3379783797dbe
| * prevent configure from putting garbage into .qmake.stashOswald Buddenhagen2017-01-201-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | in cross-builds, toolchain.prf was loaded before CROSS_COMPILE was set up, leading to caching of possibly nonsensical values. this change also necessitated that msvc-version.conf is loaded only when toolchain.prf is, which is best done by loading the former from within the latter. that seems quite appropriate in the first place. Change-Id: I62577e827a75e335e03df016bd1aa1932643fd6c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * configure: better suppression magic for old qdevice.priOswald Buddenhagen2017-01-191-4/+3
| | | | | | | | | | | | | | | | instead of forcing an early load and discarding its contents again before they could cause harm, trick qmake into not loading it at all. Change-Id: I672ca9de362b1f23bf5cfea007053570c8534fc6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * revert to building qmake with qconfig.cppOswald Buddenhagen2017-01-061-16/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | turns out that just appending builtin-qt.conf isn't a good idea: executable-editing tools (objcopy, prelink, etc.) will happily drop the "attachment". a safe method would be adding a proper section to the executable, but there doesn't appear to be an objcopy equivalent in msvc, and using entirely different methods of embedding the file with different toolchains seems like a rather bad idea. so instead go back to the old method of building qmake with a generated qconfig.cpp. of course, as said file is now created by qmake itself, we have to compile qlibraryinfo.cpp a second time, and link a second qmake executable. Task-number: QTBUG-57803 Change-Id: I9e232693550aa870cec154e49cc06add13017cc2 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * move emission of final messages to qmake-based configureOswald Buddenhagen2017-01-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * determine compiler version at build time, not in configureOswald Buddenhagen2016-12-231-63/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | this makes it consistent with the determination of the default include/library paths. this makes sense, as it's possible to switch the sdk/toolchain after building qt (within reason). a side effect of this change is that for compilers which emulate other compilers, both the real and the emulated version are now made available. Change-Id: Icfcc672c0d2e3d1b5e622993c366063d70ad327c Started-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * configure: reload spec after configuring pathsOswald Buddenhagen2016-12-221-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | this fixes the x-build for raspberry pi, as that spec refers to the sysroot. the path setup doesn't require the device options to be in effect yet, so it was sufficient to move the existing spec reload to a later point in time. Change-Id: Idc521aa13ff441931e954c7c9004472cf7061ee1 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| * fix sysrootification of install pathsOswald Buddenhagen2016-12-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initially, the idea was that QLibraryInfo would receive a pre-sysrootified ExtPrefix from the builtin qt.conf. matching this against the sysroot would then tell us whether to sysrootify the Prefix from a "regular" qt.conf as well. however, this would have lead to some major ugliness and inconsistency between the code paths, so i changed my mind. unfortunately, i failed to adjust the remaining code, leading to 169a40d51 entirely breaking sysrootification ... the proper (and nicely consistent) solution is to introduce a SysrootifyPrefix key to qt.conf. this is user-accessible as well, so as a bonus it is now possible to adjust the setting at qmake installation time. incidentally, this omission was the last thing that prevented using the same qmake host build for any imaginable configuration of the same qt version ... i think. Change-Id: Ic0eebf21f93651f6374628c0ad8b206d696a4a7e Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-161-5/+474
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure configure.pri examples/widgets/painting/fontsampler/mainwindow.cpp examples/widgets/painting/fontsampler/mainwindow.h mkspecs/features/moc.prf src/corelib/global/qglobal.h src/gui/text/qtextdocument.cpp Change-Id: Ica65512e00871695190a14ccea5c275b0165f787
| * move all target spec handling to qmake-based configure systemOswald Buddenhagen2016-12-131-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-5/+149
| | | | | | | | | | | | | | 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-0/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>