diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-04-23 14:04:14 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-04-24 07:40:13 +0000 |
| commit | 3653385af94ae7fe042d1c4845293b495bdc9854 (patch) | |
| tree | 8eab19463079bdd049133dd1ccb6e5ad1a4a22d9 /tests/auto/blackbox/tst_blackboxqt.cpp | |
| parent | 5a244da9d3d1089703c4501e7ea745f424fbcf15 (diff) | |
Qt templates: Make moc rule handle C++ amalgamation correctly
In C++ amalgamation mode, the source files need to be moc'ed before
merging, because otherwise including .moc files will not work.
Task-number: QBS-1252
Change-Id: I6e4bef4b46ec7bc3cf7ce7a950b380d469cc0afd
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/blackbox/tst_blackboxqt.cpp')
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxqt.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/blackbox/tst_blackboxqt.cpp b/tests/auto/blackbox/tst_blackboxqt.cpp index 974e7b4db..93eb68f80 100644 --- a/tests/auto/blackbox/tst_blackboxqt.cpp +++ b/tests/auto/blackbox/tst_blackboxqt.cpp @@ -179,6 +179,12 @@ void TestBlackboxQt::mixedBuildVariants() } } +void TestBlackboxQt::mocAndCppCombining() +{ + QDir::setCurrent(testDataDir + "/moc-and-cxx-combining"); + QCOMPARE(runQbs(), 0); +} + void TestBlackboxQt::mocFlags() { QDir::setCurrent(testDataDir + "/moc-flags"); |