summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Android: Compile with NDK r18 + clang"Liang Qi2018-09-281-1/+1
| | | | | | | | | | This broke the build for qtlocation. This reverts commit 176a216f4f6c36c769e9b667c12717c277a003ca. Task-number: QTBUG-70779 Change-Id: Ifd8419ffb88c1a9009319f39b11b4529b143477e Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Export modules' enabled/disabled features to cmakeFriedemann Kleint2018-09-281-0/+3
| | | | | | | | | | | | | | | | | Add properties enabled_features and disabled_features the respective library targets. This makes it possible to query the enabled classes in dependent libraries (for example, Qt for Python). Add a test verifying whether the Open GL configuration is reflected correctly in the feature properties to the existing test_opengl_lib autotest. Change-Id: I645c947073dbb36da3be81de6bc62ee0ba1e73d6 Reviewed-by: Kevin Funk <kevin.funk@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Android: Compile with NDK r18 + clangEskil Abrahamsen Blomfeldt2018-09-251-1/+1
| | | | | | | | | | | | | | In NDK version r18, the libc++.so file we used for clang has been removed. However, in r17 this was actually just redirecting to libc++_shared.so, which is still available in r18, so we can link directly to that instead. [ChangeLog][Android] Fix build issue with Android NDK r18 and clang. Task-number: QTBUG-70631 Change-Id: I658c0cabf49f27a47f38305de3c86067c8b18b25 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Merge "Merge remote-tracking branch 'origin/5.11.2' into 5.12" into ↵Qt Forward Merge Bot2018-09-122-3/+4
|\ | | | | | | refs/staging/5.12
| * Merge remote-tracking branch 'origin/5.11.2' into 5.12Qt Forward Merge Bot2018-09-122-3/+4
| |\ | | | | | | | | | Change-Id: Ic9024fac14ff01154e10aa524293d8e3e7caa021
| | * syncqt: fix forwarding injected headers, take ~3Oswald Buddenhagen2018-09-122-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in non-prefix builds, the forwarding headers always end up in qtbase's build dir, while the injected headers always live in the build dir of the module they belong to. to deal with that, we now record the target path relative to the module root dir instead of relative to the base directory of the forwarding header itself. Fixes: QTBUG-70056 Change-Id: Ic4346148a125b13e2610f6965cdf4f5266ac763e Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | winrt: Fix build with MSVC >= 15.8Oliver Wolff2018-09-121-1/+3
|/ / | | | | | | | | | | | | | | | | | | 39cb9ac873cc moved the _ENABLE_EXTENDED_ALIGNED_STORAGE define from msvc-version.conf to msvc-desktop.conf which basically removed the define from winrt builds. By adding it to winrt's common qmake.conf these builds are fixed. Change-Id: I3d87c55fb52685859713f7466012b45c46145678 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12Liang Qi2018-09-103-0/+51
|\| | | | | | | | | | | | | Conflicts: mkspecs/common/macx.conf Change-Id: I8576493b417912fa5e5501bc2c1b935d186ac209
| * macOS: Warn the user when using incompatible or untested platform SDKsTor Arne Vestbø2018-08-312-4/+38
| | | | | | | | | | | | Task-number: QTBUG-70263 Change-Id: Ic946d1efc69ebb8ba65bbba956ed55ab7183957e Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
| * macOS: Detect changes to the platform SDK and ask the user to deal with itTor Arne Vestbø2018-08-312-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the SDK upgrade (or downgrade) may subtly and silently affect the resulting binary, or if it results in build breaks, the user won't know why. We limit it to applications for now, as that's the point where it's most important to catch the SDK upgrade, but technically we should also do this for intermediate libraries. Doing it for everything will likely incur a performance cost, so we skip that for now. Change-Id: I8a0604aad8b1e9fba99848ab8ab031c07fd50dc4 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | Allow passing custom arguments to qmlplugindumpKai Koehne2018-09-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | Add QMAKE_QMLPLUGINDUMP_FLAGS variable that allows plugins to set qmlplugindump options like -app, -noforceqtquick. The naming follows the example of e.g. QMAKE_LRELEASE_FLAGS. Task-number: QTBUG-70264 Change-Id: I1d11b7f3b03fab79ab9e06188cecf31650789302 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Remove codepaths and checks for unsupported Apple platformsTor Arne Vestbø2018-08-311-2/+0
| | | | | | | | | | | | | | We no longer support macOS 10.11, iOS/tvOS 10, or watchOS 3. Change-Id: Ide03d8fac06185ef4162ba75ee54a0adf6916905 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | WebAssembly for QtBaseMorten Johan Sørvig2018-08-305-1/+367
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Fix qtbase build for clang-cl with MSVC 2017 15.8Friedemann Kleint2018-08-243-8/+3
| | | | | | | | | | | | | | | | | | | | Move the definition of _ENABLE_EXTENDED_ALIGNED_STORAGE to msvc-desktop.conf so that it becomes effective for all compilers using MSVC (icc, clang-cl). Task-number: QTBUG-50804 Change-Id: I5ff612cc0f5a712b855925f9bcf645e578e80504 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | iOS/tvOS/watchOS: Bump deployment targetsTor Arne Vestbø2018-08-243-3/+3
| | | | | | | | | | | | | | | | | | | | As planned, we only support the latest and previous release for these platforms, and by the time 5.12 is out these platforms will all have had new releases, so we should bump the deployment target now. Change-Id: Ibbb7d07bb5d9a1007ab37b88d75781be2c1f7075 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | macOS: Bump deployment target (minimum supported version) to 10.12Tor Arne Vestbø2018-08-241-1/+1
| | | | | | | | | | | | | | | | | | As discussed earlier, we don't want to keep backwards compatibility for more than two versions in addition to the current macOS version. Change-Id: I24df6fb4a08e14a9f842d209b8e0a6079c533b65 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | macOS: Share deployment target and device arch config between makespecsTor Arne Vestbø2018-08-234-12/+3
| | | | | | | | | | Change-Id: Ie06705590b4962d8b09b97e30625ef11af321763 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12Liang Qi2018-08-221-0/+1
|\| | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qtextengine.cpp tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h Change-Id: Ib9f968edbb0f3387c89bc25e914321d0738bfadc
| * Fix qtbase build for Windows ICC with MSVC 2017 15.8Alexander Shevchenko2018-08-201-0/+1
| | | | | | | | | | | | | | | | | | After 0ef66e98ccf was merged, the same should be done to Windows ICC toolchain. Task-number: QTBUG-69997 Change-Id: I1d76d8b59f87151a9064d9f7dcc3136dc1215633 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | qmake: add default path and version detection for ghs toolchainOswald Buddenhagen2018-08-172-2/+30
| | | | | | | | | | | | | | 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>
* | qmake: remove pointless input redirections from compiler callsOswald Buddenhagen2018-08-171-2/+2
| | | | | | | | | | Change-Id: I1b5d2b33ec62d24f1d6a9bd155bf3f28ab8bbf4e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-08-161-2/+2
|\| | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qconfig-bootstrapped.h src/plugins/platforms/xcb/qxcbbackingstore.cpp Done-with: Gatis Paeglis <gatis.paeglis@qt.io> Change-Id: I4af138ffb2f5306373244523768209e8873b2798
| * configure: fix passing of -L and -F to configure testsOswald Buddenhagen2018-08-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | the global flags are deprecated in favor of per-library paths, but they obviously should still work. but apparently no-one cares, because there isn't even a bug report about it ... amends 90eee08b3. Change-Id: I85aee41ca11de1715d1c750ae8e663093e012fb7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-08-071-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/corelib/doc/src/objectmodel/signalsandslots.qdoc src/plugins/platforms/cocoa/qcocoamenuloader.mm 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 tests/auto/gui/image/qimage/tst_qimage.cpp Done-with: Gatis Paeglis <gatis.paeglis@qt.io> Change-Id: I9bd24ee9b00d4f26c8f344ce3970aa6e93935ff5
| * make it possible to override the basename of module config filesOswald Buddenhagen2018-08-032-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using qt$$MODULE isn't enough if the module is composed of submodules which need the final module's headers, because that would require two modules having the same module .pri file. the first thought to fix this was to just use $$lower($$TARGET), but that breaks for testlib (QtTest). while the config file name isn't public api, it's included by a public header, so changing it is risky. so instead stay with the original pattern, but make it explicitly overrideable. the cherry-pick is needed to support QtWebEngine 5.12 with Qt 5.11, a requirement that was raised too late. Change-Id: I758c46ed403620620d577ae16866ce751271b63e Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 95b0e4c956181e535d635b108adc732d8c91a803) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * Fix builds with some MinGW distributionsKai Koehne2018-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some distributions do not define MINGW_HAS_SECURE_API globally, resulting in methods like wgetenv_s not being declared in the headers. This is probably to keep compatibility with Windows XP. Anyhow, we don't support Windows XP anymore, so we can safely add the define. Note that this is not necessary for the mingw-builds distro, which is the only one we test and support. Anyhow, I don't see any risk in adding these for other distributions. Diff was provided by Philippe Dunski in the bug report. Task-number: QTBUG-67443 Change-Id: I3a64b11541fe95e527ed44bbf8ad94469d457d3d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge branch '5.11' into devEdward Welbourne2018-07-314-3/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fix qtbase build for MSVC 2017 15.8Thomas Miller2018-07-301-0/+6
| | | | | | | | | | | | | | Fixed breaks caused by MSVC 2017 15.8 fixing std::aligned_storage. Change-Id: I5adea18c184e34bbdc3bd294d034b97383ef08a3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * qmake: skip license check while building qtOswald Buddenhagen2018-07-202-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * macOS: Use QMAKE_BUNDLE for the app part of the bundle identifier valueAndy Shaw2018-07-181-1/+4
| | | | | | | | | | | | | | | | | | | | | | If QMAKE_BUNDLE is set then this should be used for the bundle identifier value instead of the product name. This ensures that when an application provisioning profile is used that it will correctly match against it. This also brings it in line with the documented behavior. Change-Id: I627d212f59d862e7a881941748db5ef98ab4f463 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | qmake: Add support for running lreleaseKai Koehne2018-07-283-2/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG+=lrelease enables that all .ts files in TRANSLATIONS or EXTRA_TRANSLATIONS are compiled by lrelease. EXTRA_TRANSLATIONS is a new variable that is only processed by lrelease, but not lupdate - this is useful for translation files that are supposed to be empty, because they match the language of the original translation sources. If embed_translations is also set, the generated .qm files will be made available through the Qt resource system under :/i18n/. Alternatively, the user can specify an installation target by setting QM_FILES_INSTALL_PATH. Note that relative paths in TRANSLATIONS are not taken into account. That is, TRANSLATIONS = component1/de.ts component2/de.ts will cause a conflict. [ChangeLog][qmake] New CONFIG options lrelease and embed_translations were added. CONFIG+=lrelease does run lrelease on translation files listed in TRANSLATIONS and EXTRA_TRANSLATIONS. CONFIG+=embed_translations does include the generated .qm files as resources under :/i18n/. Change-Id: I94db5b8431d07b24f59b2c332ede91450f9c0c58 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Add qt_test_helper featureOliver Wolff2018-07-251-0/+35
| | | | | | | | | | | | | | | | | | | | | | To avoid (even more) duplicated code, "qt_test_helper" ensures the policy of putting a test's helper application next to the test's own executable. The helper executable is suffixed with "_helper" to avoid name clashes with its folder. Change-Id: Ic50cb1daa257e7ffc75440c10a3b90fd39424683 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Change tests' default installation folder from TARGET to folder nameOliver Wolff2018-07-251-5/+4
| | | | | | | | | | | | | | | | | | | | | | Instead of having tests installed into a folder named like their target, we now use their source folder name for the installation. An upcoming patch will rely on this behavior and simplify creation of tests that need helper applications. Change-Id: I17d9ff15edf502d82ab698627189532b83e72546 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | qmake: add line-based mode for .depend_commandsOswald Buddenhagen2018-07-232-2/+2
| | | | | | | | | | | | Task-number: QTBUG-48919 Change-Id: I6988fb2f26fd62ab40eb7392ccb0e033ad291fe6 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | qmake: Write correct Xcode project directory name to xcscheme fileTor Arne Vestbø2018-07-201-5/+5
| | | | | | | | | | | | | | | | | | | | The Xcode project name may be affected by e.g. the -o argument to qmake, so we can't assume it's based on the target. Change-Id: Ibb9f4265017ffcfe26bd8734758dcb30237c704f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | macOS: Don't try to install lldb debug script unless the module provides oneTor Arne Vestbø2018-07-201-4/+6
| | | | | | | | | | | | Change-Id: Ib22d2fdca6a4819c1b4056e3207940ceebfbe365 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | uic: Revert the microoptimization patch introducing QStringLiteralJarek Kobus2018-07-191-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts the following commits: d12d2949d1e4ac08a47928ef27bc45459b3fb104 26c3bec09bccf9006f5ef4945a428d9ef56c1d12 49b08f96e824f49fab9aa5c9a1a0ed582d4558bb We can't easily predict all code paths for QDesigner with such a microoptimization. We also don't want to generate three different string constructions depending on some sophisticated heuristics. [ChangeLog][uic] The -no-stringliteral option is now deprecated and UIC will not generate QStringLiteral anymore. Task-number: QTBUG-65251 Task-number: QTBUG-51602 Change-Id: I34a5a1934a8df19c5c84ac2ba8e5168ce5665037 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-171-1/+1
|\| | | | | | | | | | | | | | | | | | | | | 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-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-5/+0
| | | | | | | | | | | | | | | | | | | | 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>
* | SIMD: Add a haswell sub-architecture selection to our supportThiago Macieira2018-07-092-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the comment says, Haswell is a nice divider and is a good optimization target. I'm using -march=core-avx2 instead of -march=haswell because the latter form was only added to GCC 4.9 but we still support 4.7 and that has support for AVX2. This commit changes the AVX2-optimized code in QtGui to Haswell- optimized instead. That means, for example, that qdrawhelper_avx2.cpp can now use the FMA instructions. Change-Id: If025d476890745368955fffd153129c1716ba006 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-07-029-70/+44
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fix QtWayland non-toplevel in-source buildsPaul Olav Tvete2018-06-271-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | Tell qtwaylandscanner to export the symbols when we're building a module. This is done by specifying the include directory on the qtwaylandscanner command line. Task-number: QTBUG-68773 Change-Id: Ib575222261831ab01eb43e6c7caefb07e314492b Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * configure: permit digits in variable assignments on the cmdlineOswald Buddenhagen2018-06-271-4/+4
| | | | | | | | | | | | Change-Id: I21e4f93b119d28fe30cb2436c76a03b67c78fe7a Reviewed-by: Rainer Keller <Rainer.Keller@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| * wayland-scanner.prf: Remove special-casing for generated headersJohan Klokkhammer Helsing2018-06-261-63/+12
| | | | | | | | | | | | | | | | Generated headers can now be installed using inject_headers and private_headers instead. Change-Id: I51d98e2e05d12aa9f6ab09f8ccb12b81a0c0cd6f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * Fix moc warnings with no_include_pwd and shadow buildsKai Koehne2018-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If CONFIG option no_include_pwd is set, moc does not add the build directory to its include path. The path to the generated moc_predefs.h file is by default relative though, resulting in moc warnings: Warning: Failed to resolve include "debug/moc_predefs.h" for moc file xxx myheader.h Fix this by always making the path to moc_predefs.h absolute. Task-number: QTBUG-69087 Change-Id: I8ef79c8340f9ebd6b0bba15e026d65ef3c088535 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * mkspecs: Allow specifying a CROSS_COMPILE for mac/clang targetsMartin Storsjö2018-06-212-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows distinguishing between these tools and tools for the host, when cross compiling. While mac tools normally only are available on macOS, there are third party efforts to port them to other platforms. In these cases, it might be useful to use a prefix (either some sort of triplet prefix, or an absolute path) to distinguish between the host build platform compilers/tools and the ones for the cross target. The use of this variable matches the one used in a lot of other mkspecs, and shouldn't cause any issues for those who aren't setting it. Change-Id: Iaeba571d955ea79ed1249989fcc525eb1eaf1f5c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
| * Merge "Merge remote-tracking branch 'origin/5.11.1' into 5.11" into ↵Liang Qi2018-06-211-0/+2
| |\ | | | | | | | | | refs/staging/5.11
| | * Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+2
| | |\ | | | | | | | | | | | | Change-Id: I9a4571ccf826a86e055dfbba23b5e5cbd8ea55e8
| | | * Merge 5.11 into 5.11.1Oswald Buddenhagen2018-06-071-2/+3
| | | |\ | | | | | | | | | | | | | | | Change-Id: I28f48e980a9e23ddde5251608dd9d1d83df65392
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 14:51:55 +0000