summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Collapse)AuthorAgeFilesLines
* Remove -qt-xcb, -system-xcb from README and commentsKai Koehne2020-05-191-1/+1
| | | | | | | | The options got removed in commit 60588e1a5dd Pick-to: 5.15 Change-Id: Ic94f58885dab6de3c563b3dab70385570864b47d Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
* Configure: Do not automatically enable compilation of examples for testsKai Koehne2020-05-191-8/+1
| | | | | | | | | | | If user's specified to build without examples we shouldn't silently overwrite this. This might mean that some tests will fail to run then, though. Fixes: QTBUG-84087 Pick-to: 5.15 Change-Id: I53748fc03354ffdf015f85c93efc6e86c446adb8 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devLiang Qi2020-05-182-2/+9
|\ | | | | | | | | | | | | Conflicts: src/corelib/text/qbytearray.cpp Change-Id: I63706409464d31391012bacdadfd1f6300509787
| * CMake: Don't hard-code the sysroot in Qt5XXXConfigExtras.cmakeJoerg Bornemann2020-05-141-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | Instead of writing the hard-coded sysroot into the .cmake file, write the variable ${CMAKE_SYSROOT}. This makes it possible to relocate the build to a machine where the sysroot is different from the build machine. Fixes: QTBUG-83335 Change-Id: Iaa69feb9a140b050f6b5547929cc940ee0f039ce Reviewed-by: Rolf Eike Beer <eb@emlix.com> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-141-1/+1
| |\ | | | | | | | | | Change-Id: I06396fa0a3d1687a0935e48d290358edbb0e59e8
| | * Fix scanned resources in static buildsv5.15.0Tor Arne Vestbø2020-05-111-1/+1
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-81621 Change-Id: Ica23e99054c7b2498bdb1e256c256c8b430938b4 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | Make utf8_source the default for qmake buildsLars Knoll2020-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now assume that source code is encoded in UTF-8 by default on all platforms (and verify this with an auto test). Provide a CONFIG+=no_utf8_source option for backwards compatibility. [ChangeLog][qmake] qmake will tell the compiler that source code is encoded in utf-8 by default. This mainly has an effect on Windows, where MSVC still assumes source code is encoded in the current ANSI code page. Use CONFIG+=no_utf8_source to get back the Qt 5 behavior. Change-Id: I6dcafcaeefdea7d3907ccb723aeb7d23ccc0f04f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | iOS: Remove deprecated image-based launch screenTor Arne Vestbø2020-05-112-21/+7
| | | | | | | | | | | | | | | Change-Id: I50a7121c55170e1fb6950fdf7bb854cf6699df67 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | | re_escape QMAKE_INCDIR_VULKANLaszlo Agocs2020-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid getting errors like the following: Encountered invalid regular expression 'C:\VulkanSDK\1.2.131.2/include'" Change-Id: I734995878d24bc124f486fb5145ea64d0d5a9c64 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | Revert "Don't reference build directory in helper lib pri"Liang Qi2020-05-071-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c9d9ac5bb07a737c862b40302cd681f7b3b321fd. This breaks prefix build which tries to link to install folder. Task-number: QTBUG-83967 Change-Id: I084152afde91c2063154bef8ac99d7e997c9394b Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-05-051-8/+8
|\| | | | | | | | | | | Change-Id: I003c0d6271c6444748bf30b4331eca3fb2410f44
| * | Allow switching of QT_NO_CREATE_VERSIONLESS_TARGETSKai Koehne2020-05-051-8/+8
| |/ | | | | | | | | | | Fixes: QTBUG-83774 Change-Id: Ib3f2507a917046426b94a779e205012ce52cbfe9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix solaris buildKai Koehne2020-05-051-0/+1
| | | | | | | | | | | | | | | | | | Fixes enabling of fPIC that got removed as a side-effect of commit 39fc377bf. Fixes: QTBUG-83949 Change-Id: I2bed7edb5b1f97192cbcf9e12dd927a17803d864 Pick-to: 5.15 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-05-046-58/+75
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/text/qlocale.cpp src/network/access/qnetworkaccessmanager.cpp Regenerated tests/auto/testlib/selftests/float/CMakeLists.txt Change-Id: I5a8ae42511380ca49a38b13c6fa8a3c5df8bed01
| * Fix building of autotests for certain configurationsOliver Wolff2020-04-281-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a configuration is static and has builtin_testdata defined, it was possible that the "testdata" resource that is generated in testcase.prf was used for a qmlimportscan directly. This generated test data resource is no file though. It's a "qmake struct" that contains files and a base folder so that we should add every file from the "file list" of that struct. It is possible, that the generated resource has a base, but no files. Thus we need two loops or we can end up with a command line that ends with "-qmldir". If qmlimportscanner decided to warn/error out in this case in the future this feature could be broken and the point of breakage might not be obvious. Change-Id: I2111f594f7d5cf40521b8fe9236a8be9e2ed1b07 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * iOS: Use storyboard instead of .xib file for launch screenTor Arne Vestbø2020-04-263-46/+49
| | | | | | | | | | | | | | | | | | Apps on the iOS app store are required to use storyboards for their launch screens from June 30th 2020. Change-Id: Iae34042294fb167a2c893542c57dfaacaf1e929c Fixes: QTBUG-83512 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Fix build with -no-compile-examplesKai Koehne2020-04-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure -no-compile-examples means that the examples won't be compiled, but processed by qmake to generate install targets. So we shouldn't do any substitution (like it is done for CMake targets), or extra compilers / copies (like it is done for qmltypes). Also install the qmldir files that some qml examples need. Fixes: QTBUG-83375 Fixes: QTBUG-83704 Change-Id: I6a9393bd914d98a5d85f4089205510e49a435842 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Merge remote-tracking branch 'origin/5.15' into 5.15.0Qt Forward Merge Bot2020-04-215-5/+110
| |\ | | | | | | | | | Change-Id: I9d9f9e0955144241fcee6148fc78c4501e2ffcea
| * | winrt: Fix manifest creation for Visual Studio 2019Oliver Wolff2020-04-211-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 2019 still uses VCLIB version 140 - minVersion and maxVersionTested have to be set for every MSVC version Change-Id: I9300e03115e2e99fd250ec85bdd7f3367ab00d48 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Miguel Costa <miguel.costa@qt.io>
* | | Don't reference build directory in helper lib priTor Arne Vestbø2020-04-301-9/+9
| | | | | | | | | | | | | | | | | | | | | Otherwise the helper-lib pri file will be unusable when installed. Change-Id: Id79a61e6ca9bb1b32c82ee158fd18f51319c484e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | Remove checks for glibc < 2 from qplatformdefs.h filesJoerg Bornemann2020-04-236-39/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The last release of glibc 1 was 1995 and can be considered outdated. Also, the current check prevented building with e.g. musl libc. Every file that includes common/posix/qplatformdefs.h already has QT_SOCKLEN_T defined to socklen_t, so remove the definition from those completely. This is a continuation of 813f468a and a421e409. Change-Id: Icf2692a8e814286487662e290a8f844872eefe53 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-04-225-5/+110
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/widgets/widgets/qabstractbutton.cpp src/widgets/widgets/qbuttongroup.cpp src/widgets/widgets/qbuttongroup.h src/widgets/widgets/qsplashscreen.cpp tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp tests/benchmarks/opengl/main.cpp Needed update: src/plugins/platforms/cocoa/CMakeLists.txt Change-Id: I7be4baebb63844ec2b3e0de859ca9de1bc730bb5
| * | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Liang Qi2020-04-202-3/+12
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2020-04-202-3/+12
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/qt_common.prf src/network/ssl/qsslsocket_openssl_symbols.cpp src/network/ssl/qsslsocket_openssl11_symbols_p.h src/network/ssl/qsslsocket_opensslpre11_symbols_p.h src/plugins/platforms/wasm/qwasmeventdispatcher.cpp Done-With: Timur Pocheptsov <timur.pocheptsov@qt.io> Change-Id: I04fb3139a0e2efd4bc2f0959f131679f192fa0f8
| | | * | Fix path replacement on install for header module prl filesJoerg Bornemann2020-04-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For prefix builds the prl files of header modules still contained the absolute path of the install prefix instead of $$[QT_INSTALL_LIBS]. This was, because the QMAKE_PRL_INSTALL_REPLACE variable was only filled for 'lib' TEMPLATE projects. Header modules, however, have the 'aux' template. Fixes: QTBUG-82871 Change-Id: I90f248967f1bff41423d871a977ae91c78015bbd Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | | * | macOS: Fix CONFIG+=separate_debug_info for custom QMAKE_BUNDLE_EXTENSIONJoerg Bornemann2020-04-081-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code that sets up QMAKE_RESOLVED_BUNDLE did not take QMAKE_BUNDLE_EXTENSION into account. The logic is the same as in UnixMakefileGenerator::init(). Fixes: QTBUG-83222 Change-Id: I8fc4f16b399303394f2106e5c1071347ace93d4a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | | Add option to select build target for IntegrityJanne Koskinen2020-04-201-2/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From 11.7.6 onwards you need to select if your build is rel/dbg/chk/cov. Added env variable where you can add which build target to configure. Task-number: QTBUG-74716 Change-Id: I9ab3dd6177c5c5fa1da6aa7556784fa86d0d0348 Reviewed-by: Timo Aarnipuro <timo.aarnipuro@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | / Add mkspec for INTEGRITY Qualcomm SA8155P ADPKimmo Ollila2020-04-172-0/+88
| | |/ | |/| | | | | | | | | | Change-Id: I3430868fb88f357c3d2d1d3cd8e00088aa26649c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | linux-clang/qplatformdefs: fix building with musl libcKylie McClain2020-04-201-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | This is basically a duplicate of the commit which fixed building with musl, but on linux-g++, 813f468a14fb84af43c1f8fc0a1430277358eba2. Change-Id: I399005ac6947ba3f2b4ed5087472cd9d54a0850d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2020-04-111-1/+1
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-04-111-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/network/socket/platformsocketengine/platformsocketengine.pri Change-Id: I22daf269a8f28f80630b5f521b91637531156404
| | * | WASM: Replace NO_EXIT_RUNTIME=0 with EXIT_RUNTIME=1Fredrik Orderud2020-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of double negation to make the configuration easier to understand. Change-Id: I5dfe256c2ac2ef131c3db20dce9ff492c529a5b1 Reference: https://emscripten.org/docs/tools_reference/emcc.html Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | | | avoid compile warning when using clang++ with -Wshorten-64-to-32Martin Koller2020-04-111-1/+1
|/ / / | | | | | | | | | | | | Change-Id: I78a6cd84ac5b8c250d9569d864a7e38269b85e10 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2020-04-0810-26/+54
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-04-0810-26/+54
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-081-0/+4
| | |\| | | | | | | | | | | | | Change-Id: I34a71ddbc6afb1f12a0a044d0d3876e1af58d60c
| | | * Fix linking of header only Qt5Zlib for cmake static buildsKai Koehne2020-04-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-79547 Change-Id: Ibd810b5415ae8f7a965caf8b94b0df834a867836 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2020-04-031-2/+2
| | |\ \
| | | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-031-2/+2
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/benchmarks/corelib/text/qstringlist/qstringlist.pro Change-Id: Ie9b97bd83c2df00fd9b556b5f09d405f71970169
| | | | * Pass SDK root to the linker as -isysroot, not -Wl,-syslibrootTor Arne Vestbø2020-04-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | | wasm: add support for enabling AsyncifyMorten Johan Sørvig2020-04-031-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ./configure […] --device-option EMSCRIPTEN_ASYNCIFY=1 Set QT_HAVE_EMSCRIPTEN_ASYNCIFY as a feature flag, enable optimizations for asyncified debug builds. Change-Id: I81c887a411780e328aed48ec09ff6b9277c3bccf Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
| | * | | wasm: remove obsolete configMorten Johan Sørvig2020-04-031-14/+0
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | On emsdk 13.9.x WASM_OBJECTS_FILES is always on, and BINARYEN_TRAP_MODE is not needed Change-Id: Id1da1db0278e131f95045bc0902f5cc4c22c1522 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2020-03-311-1/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp Change-Id: Ifaa56153f5f0d687a6b4d94f84fcfa1e1751afd2
| | | * MinGW: Fix build with -angleKai Koehne2020-03-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Qt 5.14, debug libs for MinGW don't necessarily have a 'd' suffix anymore. Fixes: QTBUG-83087 Change-Id: Ia9f499ebed05e96fb056134681a2124c2262fb08 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | * | wasm: refactor network to use fetch APILorn Potter2020-03-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has better support for threaded use, and gets rid of bind use. This requires emscripten 1.38.37 and above Task-number: QTBUG-76891 Change-Id: Ic30a6820c2ce945c314751c06cfc356914a71217 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
| | * | Detect Visual C++ 2019 mode in clang_cl / intel_iclAllan Sandfeld Jensen2020-03-251-0/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: Icdca1551a56e894f6266b33ac059bbbfa3b18453 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * | Revert "wasm: support emsdk >= 1.39.4"Morten Johan Sørvig2020-03-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bcdf49bcc6c357c9c30708e2e95ce4b8dbeb9f8a. This was a 5.14-only commit which accidentally found its way to 5.15. Change-Id: Iaef6f05fce20ab61d3afb8cb3c359a037e4c0b28 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
| | * | Fix whitespace in Qt5XXConfig filesKai Koehne2020-03-241-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove some unneeded empty lines, and fix indentation. Change-Id: Ie35e95f35f9625cc75070074be96bdeb62d5fd4c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * | CMake: Also import Qt plugins that are not literally named *PluginKai Koehne2020-03-241-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are some plugins in qtlocation, qtdeclarative whose names are not suffixed with 'Plugin', so the current logic fails to load the corresponding QtModule_XXX.cmake file. Work around this by just searching for Qt5$${CMAKE_MODULE_NAME}}_*.cmake. Users can define QT5_STRICT_PLUGIN_GLOB or Qt5$${CMAKE_MODULE_NAME}_STRICT_PLUGIN_GLOB to change back to the old behavior. [ChangeLog][cmake] Fixed an issue where some Qt location and declarative plugins whose name did not end with "Plugin" where not imported by the corresponding Qt component package. You can force the old behavior by setting QT5_STRICT_PLUGIN_GLOB or Qt5ModuleName_STRICT_PLUGIN_GLOB before the find_package(Qt5 ...) call. Fixes: QTBUG-58812 Change-Id: Ic8adf9562841ed49eabc4f7fb2b5ae257ca606cd Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Mitch Curtis2020-03-231-1/+1
| | |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 20:32:59 +0000