Qt 6.8.3 with BlackBerry 10 (QNX 8 / ARMv7) patches
 
 
 
 
 
 
Go to file
Joerg Bornemann 5280f307a8 CMake: Yield error if a feature is ENABLEd and CONDITION is false
Consider a feature that has ENABLE and CONDITION expressions. For
example, system-libb2 on a Linux machine that does not have the
libb2-dev package installed:

qt_feature("system-libb2" PRIVATE
    LABEL "Using system libb2"
    CONDITION Libb2_FOUND
    ENABLE INPUT_libb2 STREQUAL 'system'
    DISABLE INPUT_libb2 STREQUAL 'no' OR INPUT_libb2 STREQUAL 'qt'
)

If the feature is enabled by the user by setting
FEATURE_system_libb2=ON, then there's an error:
    Feature "system_libb2": Forcing to "ON" breaks its condition...

This is expected.

If the feature is enabled by the user by triggering the ENABLE condition
via the -system-libb2 configure flag (that sets INPUT_libb2 to
"system"), we did not get an error message.

This was unexpected and inconsistent.

Now, we consider features that are enabled via their ENABLE condition as
set by the user and yield an error if the CONDITION doesn't match.

Fixes: QTBUG-126144
Change-Id: I249baf9ab4f434f5a96894f4ec055f70859ffca9
Reviewed-by:  Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit ad227368c3ab3a9dc68208bce2d075edefe7e6e0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2024-06-12 15:53:35 +00:00
.github/workflows Repair github action workflow 2021-11-10 18:57:33 +01:00
LICENSES SQLite: Update identified license 2024-04-28 12:14:17 +02:00
bin cmake: Override generator for iOS projects to Xcode in qt-cmake.in 2024-03-18 22:34:48 +01:00
cmake CMake: Yield error if a feature is ENABLEd and CONDITION is false 2024-06-12 15:53:35 +00:00
coin coin: Make macOS 12 and 13 Tart ARM VMs significant 2024-06-03 12:57:01 +00:00
config.tests Add copyright and licensing to .cpp and .h files missing them 2024-05-28 09:47:01 +02:00
dist Remove dist/README 2024-02-29 15:35:57 +01:00
doc Android: Update Gradle to 8.7 and Android Gradle Plug-in (AGP) to 8.4.0 2024-05-24 06:37:13 +03:00
examples Widget gallery example: set color scheme before constructing UI 2024-06-11 19:35:30 +00:00
lib Purge all fonts 2015-08-18 19:59:14 +00:00
libexec CMake: Allow building all examples as standalone just like tests 2024-03-14 11:44:16 +01:00
mkspecs qmake: Do not disable deprecation warnings for MSVC (C4996) 2024-05-28 20:19:14 +02:00
qmake Move QT_DISABLE_DEPRECATED_UP_TO and QT_WARN_DEPRECATED_UP_TO to header 2024-05-22 18:38:09 +02:00
src QThread: mark is(Main|Current)Thread() noexcept 2024-06-12 15:53:35 +00:00
tests Use /tmp in tst_qcompleter on VxWorks 2024-06-12 15:53:35 +00:00
util qlocalexml2cpp.py: rework StringData handling of bit-sizes 2024-06-02 15:26:17 +02:00
.cmake.conf Add preliminary support for Qt for visionOS 2024-04-18 05:00:57 +02:00
.gitattributes Give batch files CRLF line endings 2020-11-04 15:02:29 +00:00
.gitignore Git ignore Visual Studio CMake build directories 2023-11-24 23:42:05 +01:00
.lgtm.yml Skip LGTM analysis for the bootstrap library and tools 2020-07-16 01:04:34 +02:00
.tag
CMakeLists.txt cmake: add _extra_files IDE target from heuristics 2024-04-12 08:36:01 +08:00
config_help.txt Change the -qpa configure argument logic 2024-05-14 20:48:12 +02:00
configure Change configure license 2024-02-02 15:23:02 +00:00
configure.bat configure.bat: Fix errors on Windows 2024-03-05 11:56:24 +01:00
configure.cmake CMake: Emit the 'msvc_obj_debug_info' feature only when MSVC is used 2024-06-10 22:25:32 +00:00
dependencies.yaml Re-add dependencies.yaml now that qt5.git wip/qt6 builds fine 2019-09-18 13:19:31 +02:00
licenseRule.json Add license exception 2024-04-24 19:02:09 +02:00
qt_cmdline.cmake Remove superfluous entries from qt_cmdline.cmake 2024-05-03 18:42:37 +02:00