Skip to content

Commit

Permalink
Support QNX QCC compiler
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
Passeli committed Sep 16, 2021
1 parent 8dd14a9 commit 5f3e8dd
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tests/auto/tools/moc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5f3e8dd

Please sign in to comment.