summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Detect C standard and try using the most recent one (take 2)Allan Sandfeld Jensen2018-04-217-2/+35
| | | | | | | Fixes the default C version used with gcc < 5 Change-Id: I948dece961caed8e6b181e1c6e6b9dc43c46583e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-202-7/+6
|\ | | | | | | Change-Id: I0bea38585382b5d9c8d7a013bf6bcb3a6008d159
| * qmake: fix sdk resolution on macosTim Uy2018-04-181-6/+6
| | | | | | | | | | | | | | | | | | the 'info' variable was re-used too early. make a new one 'infoargs' instead. Task-number: QTBUG-67286 Change-Id: I77881ecbfce338d653358c5e5edac84e1c0c7de3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * iOS: Allow building QML based test casesAndy Shaw2018-04-181-1/+0
| | | | | | | | | | | | | | | | | | | | In order to be able to build and test a testcase on an iOS device it needs to be a bundle. So the app_bundle config should only be removed if the testcase_no_bundle is set. This is already done by testcase.prf. Task-number: QTBUG-45211 Change-Id: I4f16ea832ccff2a5db5fed0050fa0344b4ac9ad6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-183-14/+2
|\| | | | | | | Change-Id: I86f04fc3b2e4291f161a4985adddd6fd6c789d33
| * Use optimize_size instead of duplicating similar logicAllan Sandfeld Jensen2018-04-143-14/+2
| | | | | | | | | | | | | | | | | | The android mkspecs had their own way of doing the same as optimize_size Change-Id: Id05822df6bdeb8b3aafada2901bd61530c490fe9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Merge remote-tracking branch 'origin/5.11' into devLars Knoll2018-04-123-10/+22
|\| | | | | | | Change-Id: I9f802cb9b4d9ccba77ca39428a5cb1afd2d01642
| * rework syncqt interaction regarding cross-tree pathsOswald Buddenhagen2018-04-123-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of relying on more or less accidental qmake behaviors regarding the base dir for relative paths (esp. if a file does not exist yet), make everything explicit. to that effect, clearly define the base tree (source or build) for every syncqt-generated variable, and write only in-tree relative paths to the variables. on the receiving end, resolve the paths as soon as headers.pri was read. Task-number: QTBUG-67111 Change-Id: I32ae5760fb62ebc650fdb69e46aac786a8141564 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-04-113-6/+42
|\| | | | | | | | | | | | | Conflicts: src/plugins/platforms/ios/quiview.mm Change-Id: I0fd0adeca1590fffddd577873172f6d987a60412
| * configure: cache test output as wellOswald Buddenhagen2018-04-102-5/+39
| | | | | | | | | | | | | | | | that way we can create a config.log which is consistent with the end state even if (some) tests are not executed this time around. Change-Id: Ia953ede62d6640aab912559f435ceb1f9ec6d9dc Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * don't call qmake's exists() with an empty argumentOswald Buddenhagen2018-04-101-1/+3
| | | | | | | | | | Change-Id: I73330bd1c2de1734c5ac5c668ff9af7e85fc902a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-101-2/+5
|\| | | | | | | Change-Id: I0120f804522c0c652e9537b6e9fe08189f071ed2
| * macx-clang: Update informal documentation for xcb buildGabriel de Dietrich2018-04-091-2/+5
| | | | | | | | | | | | | | | | | | Remove references to XKB and explain what to do if pkg-config is missing or unwanted. Change-Id: I099bf01ff49e1b8f6e822a50f0fe4904965a7a9f Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | qmake: add support for mkspecs which don't support strict_c++Mikhail Svetkin2018-04-052-4/+8
| | | | | | | | | | | | | | | | | | | | Some mkspecs do not support c++ strict mode. We should allow them to build Qt with GNU extenstions. Change-Id: I0d76cf95355b38953e3475773ec5474c856e1370 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | qml_module.prf: add 'install_qml_files' configJ-P Nurmi2018-04-051-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow QML modules to request installing QML files on the file system regardless of whether the QML files are embedded to resources. Qt Quick Controls need both; external QML files, that are prioritized over compiled resources, can be left out from the final deployment package. The desired setup can be configured as follows: CONFIG += install_qml_files builtin_resources qtquickcompiler With this, there is no need to write custom install/copy/qrc rules for QML files. Change-Id: I2ff2974b64efaea341b6ebb4c9fc2612497d7a33 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | qml_module.prf: embed qmldir to resources in static builds onlyJ-P Nurmi2018-04-051-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For "import MyModule", the QML engine looks for a qmldir file in $eachImportPath/MyModule. One of the built-in import paths is ":/qt-project.org/imports". This is meant for static "plugins", where the resources and the plugin are already inside the binary image. For dynamic plugins, the qmldir file is what enables the QML engine to find the plugin in the first place, so it makes no sense to embed it inside the plugin's resources. Change-Id: I29f006efb58d91f7e5212c347087535b06e8c637 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-312-2/+3
|\| | | | | | | Change-Id: I33b47095efdfe0ba698c6a88ca41ec911f432208
| * Fix debug_and_release builds with CONFIG += qtquickcompilerSimon Hausmann2018-03-292-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | For correct debug/ and release/ suffix substitution and thus avoid concurrent access to generated files, we have to declare the output directory variable used by qtquickcompiler.prf in qtdeclarative here and enable it for substitution. Change-Id: Id8483daffdf1b9990396c55f7bc0d08a2f65cafd Task-number: QTBUG-66675 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-03-282-17/+6
|\| | | | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/cocoa/qnsview.mm src/plugins/platforms/cocoa/qnsview_mouse.mm src/testlib/testlib.pro Change-Id: Ia0ce4243418fe6a485b0f290c67bd433b3b04ff2
| * Revert "Detect C standard and try using the most recent"Friedemann Kleint2018-03-267-37/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The change causes a crash when compiling the xkbcommon 3rdparty library and compile failures (qtimageformats on Android). This reverts commit a47cb146809e32f43449dcfe9932833c2f0ab987. Task-number: QTBUG-67326 Task-number: QTBUG-67327 Change-Id: I5ddc4eccad699e3eaec535fd6a63d11b0026b42e Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
| * Remove CMake code for CMake < 3.1Kevin Funk2018-03-242-17/+6
| | | | | | | | | | | | | | | | | | This removes the following functions from Qt5CoreMacros: - qt5_use_modules(...) Task-number: QTBUG-63519 Change-Id: I59769060a3a93686bf319b558c0ede55755fdb70 Reviewed-by: David Faure <david.faure@kdab.com>
| * Detect C standard and try using the most recentAllan Sandfeld Jensen2018-03-217-2/+37
| | | | | | | | | | | | | | Fixes the default C version used with gcc < 5 Change-Id: I948dece961caed8e6b181e1c6e6b9dc43c46583f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-211-2/+2
|\| | | | | | | Change-Id: I35a6555e3885e489f88aa9b4b0142e1017f7a959
| * Fix CONFIG+=qtquickcompiler and immediate resources with shadow buildsSimon Hausmann2018-03-201-2/+2
| | | | | | | | | | | | | | | | | | Generated files should be added to RESOURCES with an absolute path. Task-number: QTBUG-67011 Change-Id: Ief82b576824df9abd0901970f076e30dfe57b7d0 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | macOS: Explicitly link to debug version of framework when neededTor Arne Vestbø2018-03-161-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Qt is configured for both debug and release, and frameworks are enabled, we produce two dynamic libraries inside each framework, eg: QtCore.framework/QtCore QtCore.framework/QtCore_debug When building an executable against these frameworks, we pass -framework QtCore, and the resulting executable will have its LC_LOAD_DYLIB load commands pointing to e.g.: @rpath/QtCore.framework/Versions/5/QtCore When running the executable, the dynamic loader will load the dynamic library dependencies based on these load commands. By setting the DYLD_IMAGE_SUFFIX environment variable at runtime to '_debug', the dynamic loader will prefer the debug versions of each library inside the frameworks. Unfortunately the use of an environment variable to choose debug or release versions leaves room for mismatches between the executable and the libraries that are loaded. An executable built in debug mode will at runtime pick up the release versions of the Qt libraries unless the DYLD_IMAGE_SUFFIX has also been set to match the build configuration of the executable. This results in confusing situations such as building your application in debug mode, and then stepping into Qt code but not getting any symbols. Qt Creator has an option to run the application with DYLD_IMAGE_SUFFIX set, but this is not enabled by default due to the startup cost of loading the Qt debug libraries. More critically, it results in tests failing when the tests are using QTest::ignoreMessage to ignore warnings produced by Qt, and these calls are ifdefed (correctly) inside QT_NO_DEBUG, as the test (built in debug mode) will then expect warnings from Qt, but those warnings are not emittet, as the test is run against the release version of the Qt libraries. To mitigate this mismatch, we now link the Qt frameworks using an explicit suffix, just like we would for no-framework builds on macOS, for debug and release builds on Windows, and for normal builds on other Unixes, leaving the dependency chain for the application predictable: @rpath/QtCore.framework/Versions/5/QtCore_debug This also conceptually matches how Xcode builds applications and frameworks, where it never relies on DYLD_IMAGE_SUFFIX, and instead uses two separate build directories, one for each configuration. The change means that Qt Creator will always load the Qt debug libraries if the application is built in debug mode. For Qt development this is a good thing, as you expect to be able to step into Qt code. For our users, the added startup cost can be mitigated by shipping our binary packages as release-only, but with separate debug info enabled. Change-Id: Ib9f1f2dab90ed00b9fb011200e3a69c71955e399 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | macOS: Allow tests to mark themselves as not supporting high-DPITor Arne Vestbø2018-03-142-0/+20
| | | | | | | | | | | | | | | | | | Some tests are not written to handle running on a retina screen, resulting in additional test failures when trying to fix a CI test failure on a local retina-enabled machine. Change-Id: I0fed33c38792b686ac83abba2bfbc45623382200 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-081-1/+1
|\| | | | | | | Change-Id: Idf471ca5c6cf211813466b539ce45bdc1ae9b97c
| * Apple: resolve SDK version of QMAKE_LINK_C and QMAKE_LINK_C_SHLIBMarcus Calhoun-Lopez2018-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | On Apple OSes, both compilers and linkers are given an absolute path. For consistency, the same should be done with the C linkers. The change is also a convenience to the MacPorts project, which actively discourages ambiguous compiler names. (https://trac.macports.org/wiki/UsingTheRightCompiler). Change-Id: Ic1885aed825340696e9fde766788eebf51de3ff6 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-072-2/+2
|\| | | | | | | Change-Id: I110feec4750bd304975bab4f3f33d3a61a4e08bd
| * Android: add option `-mstackrealign` to clang-x86 mkspecVyacheslav Koscheev2018-03-061-1/+1
| | | | | | | | | | | | | | Task-number: QTBUG-66770 Change-Id: I5e8ced0fa60c67d7908f21e5c486fea0d7a50004 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * Add WFD_DEVICE_CLIENT_TYPE attribute for INTEGRITY S820Am ADPKimmo Ollila2018-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to be compatible with latest Qualcomm BSP releases. This patch also makes it possible to select HW layer via QT_OPENWFD_CLIENT_ID and QT_OPENWFD_PIPELINE_ID environment variables. Change-Id: Ie795b21afc61a1de7c1d0b52cdb30a754e3f8266 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Timo Aarnipuro <timo.aarnipuro@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit 00f693d3e5046999270c92731e34a3e7fcd01c6b) Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Turn on more warnings for Objective-C code on Apple platformsJake Petroules2018-03-051-9/+19
|/ | | | | | Change-Id: I7d5f211e2441415134c5905b159b41dc3b2b231b Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* configure: introduce 'subarch' term to expression evaluatorOswald Buddenhagen2018-02-221-0/+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>
* unify windows mkspecs: define c++ flags explicitlyAlexander Shevchenko2018-02-224-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | with 40e87491 merged, 'QMAKE_CXXFLAGS' variable in 'win32-g++' toolchain became defined via 'QMAKE_CFLAGS'. the similar can be found in 'win32-clang-msvc' and 'win32-icc' toolchains too. this works for now, because such definitions just duplicates code from includes, like 'gcc-base.conf', 'msvc-desktop.conf', etc. but it would became broken, if changes would be applied to 'QMAKE_CXXFLAGS' definitions in that includes, prior to the redefinitions in 'win32-*/qmake.conf' toolchains. thus 'QMAKE_CXXFLAGS' definitions in 'win32-*/qmake.conf' toolchains should not depend on 'QMAKE_CFLAGS' and be done explicitly. in order to apply this change correctly to 'win32-icc' toolchain, its 'QMAKE_CFLAGS' variable should become dependent on definitions in the includes, similar to 'win32-clang-msvc' and 'win32-msvc' toolchains. Change-Id: I5e820e44a769a590ba63f70dcb3a115311093311 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* mkspecs: Factorize common parts of win32-g++ and win32-clang-g++Martin Storsjö2018-02-213-133/+88
| | | | | Change-Id: I49dc036aedb4290889bce8ef616b4f7291e79d4f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* fix installation of resources for example sourcesAlexander Volkov2018-02-211-1/+1
| | | | | | | | | contains() interprets the regexp as being implicitly anchored, so the leading part of the path needs to be explicitly matched. Change-Id: I1efa07dc99bb2db1717d2a66621899e23c144164 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* qmake: fix immediate RESOURCES with absolute RCC_DIROswald Buddenhagen2018-02-201-1/+1
| | | | | | | | $$RCC_DIR can be absolute, so simple concatenation with $$OUT_PWD is bound to fail. Change-Id: Ibd80c49656c0e03b8a86ebca851af106cced08fb Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* mkspecs: Add a win32-clang-g++ mkspec, for clang targeting mingw, like g++Martin Storsjö2018-02-162-0/+130
| | | | | Change-Id: I427e46e6c34c2beeb2a815f1af512e4e8bd213c2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.10' into 5.11" into ↵Liang Qi2018-02-154-10/+10
|\ | | | | | | refs/staging/5.11
| * Merge remote-tracking branch 'origin/5.10' into 5.11Liang Qi2018-02-154-10/+10
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/corelib.pro src/corelib/global/qrandom.cpp src/network/access/qhttpnetworkrequest_p.h src/plugins/platforms/cocoa/qcocoamenu.mm src/plugins/platforms/cocoa/qcocoansmenu.mm src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/cocoa/qnsview.mm src/plugins/platforms/offscreen/qoffscreenintegration.h src/widgets/kernel/qaction.cpp src/widgets/widgets.pro Done-with: Andy Shaw <andy.shaw@qt.io> Change-Id: Ib01547cf4184023f19858ccf0ce7fb824fed2a8d
| | * unify windows mkspecs: move angle/vulkan includesAlexander Shevchenko2018-01-272-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'win32-icc' toolchain: - remove duplicated angle/vulkan includes. 'win32-g++' toolchain: - place angle/vulkan includes before the unrelated compiler-related variable re-definitions, similarly to the 'win32-clang-msvc', 'win32-icc', and 'win32-msvc' mkspecs. Change-Id: Ie04bc9fb1d51ec0366b42713439f680e51214bbc Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| | * Fix build of applications on iOSJake Petroules2018-01-251-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PRODUCT_BUNDLE_IDENTIFIER property was not defined in the Xcode project file and therefore the build would fail. This fixes a regression introduced by 0749ba2c5e. Task-number: QTBUG-65673 Change-Id: I8089b36d86588223ec34859af7388c99a3574d8b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| | * Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into ↵Liang Qi2018-01-241-1/+1
| | |\ | | | | | | | | | | | | refs/staging/5.10
| | | * Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-241-1/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qrandom.cpp tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp Change-Id: Icc10543a1f2db5d640d01796bfec70a63517a6b2
| | * | | Add -DQT_{module}_LIB in pkg-config cflags for each Qt moduleAlexis Jeandet2018-01-241-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build systems such as Meson heavily rely on pkg-config to get build flags. -DQT_{module}_LIB isn't exported in .pc files which makes Meson unable to build some codes out of the box. Change-Id: I806998f19f815e05a47b60129977e52587b38d47 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| | * | unify windows mkspecs: delete redundants in 5.10Alexander Shevchenko2018-01-221-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mingw-w64 toolchain: - remove 'QMAKE_CFLAGS_AESNI' and 'QMAKE_CFLAGS_SHANI' definitions, which are already set in 'gcc-base.conf' toolchain; this is a continuation of 77347a36 relating variables, introduced in 5.10, - remove 'gcc-base.conf' duplicate inclusion, left after eef2d1af was merged into 5.10. Change-Id: I328def916ccfb93c3f6b8336eb8801defbac37ae Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| | * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-196-17/+38
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qprocess_win.cpp Change-Id: Ib61b74a69922ec1e9eecbba5f75352b4ec167fa9
* | | | | syncqt: fix injected headers outside qtbase in non-prefix buildsOswald Buddenhagen2018-02-151-1/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in non-prefix configs, one has to differentiate between the module's own build dir and qtbase's build dir, because the forwarding headers are placed in -outdir under include/, while the actual headers end up in the real build dir under src/. Change-Id: I1d8ac904556b354bd113995316ba11dd6560a70d Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | Merge remote-tracking branch 'origin/5.9' into 5.11Liang Qi2018-02-147-18/+39
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/corelib/animation/qvariantanimation.cpp src/corelib/global/qglobal.cpp src/corelib/global/qlogging.cpp src/corelib/io/qprocess_win.cpp src/corelib/json/qjsonarray.cpp src/corelib/tools/qsimd_p.h src/corelib/tools/qtimezoneprivate_p.h src/corelib/xml/qxmlstream_p.h src/gui/kernel/qsimpledrag.cpp src/gui/kernel/qsimpledrag_p.h src/plugins/generic/generic.pro src/plugins/platforms/cocoa/qcocoamenu.mm src/widgets/styles/qmacstyle_mac.mm tests/auto/concurrent/qtconcurrentmap/BLACKLIST tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp tests/auto/gui/kernel/qwindow/BLACKLIST tests/auto/widgets/dialogs/qmessagebox/BLACKLIST Change-Id: I508d686cf20f7f8cc6a7119b9bc7c3bbb505c58e
| * | | Support for Q_OS_ANDROID_EMBEDDED and android-embedded build flagsOtto Ryynänen2018-01-201-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Embedded Android build (Boot to Qt Android injection) is defined by having both Q_OS_ANDROID and Q_OS_ANDROID_EMBEDDED flags defined, as well as having Qt config android-embedded. This commit enables the possibility to build embedded Android builds. (i.e. Qt build for Android baselayer only, without JNI) Change-Id: I8406e959fdf1c8d9efebbbe53f1a391fa25f336a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 21:30:21 +0000