From 5f3e8dde958d2c218b90884d4a368fe9860a41b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pasi=20Pet=C3=A4j=C3=A4j=C3=A4rvi?= Date: Thu, 16 Sep 2021 18:19:16 +0300 Subject: Support QNX QCC compiler tests/auto/tools/moc/CMakeFiles/tst_moc.dir/tst_moc.cpp.o: in function `tst_Moc::os9Newline()': qtbase/tests/auto/tools/moc/tst_moc.cpp:1225: undefined reference to `Os9Newlines::staticMetaObject' tests/auto/tools/moc/CMakeFiles/tst_moc.dir/tst_moc.cpp.o: in function `tst_Moc::winNewline()': qtbase/tests/auto/tools/moc/tst_moc.cpp:1239: undefined reference to `WinNewlines::staticMetaObject' Pick-to: 6.2 Change-Id: I629d67c1190e09b26dc09e41cb7170cb0eadf1cb Reviewed-by: Fabian Kosmale --- tests/auto/tools/moc/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/tools/moc/CMakeLists.txt b/tests/auto/tools/moc/CMakeLists.txt index 792e8d5f9c..228af5992e 100644 --- a/tests/auto/tools/moc/CMakeLists.txt +++ b/tests/auto/tools/moc/CMakeLists.txt @@ -85,11 +85,11 @@ qt_internal_extend_target(tst_moc CONDITION CMAKE_CROSSCOMPILING MOC_CROSS_COMPILED ) -if (UNIX AND (CLANG OR GCC OR ICC)) +if (UNIX AND (CLANG OR GCC OR ICC OR QCC)) qt_wrap_cpp(os9_moc os9-newlines.h) endif() -qt_internal_extend_target(tst_moc CONDITION UNIX AND (CLANG OR GCC OR ICC) +qt_internal_extend_target(tst_moc CONDITION UNIX AND (CLANG OR GCC OR ICC OR QCC) SOURCES os9-newlines.h win-newlines.h -- cgit v1.2.3