summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/tools/moc/preprocessor.cpp2
-rw-r--r--tests/auto/tools/moc/tst_moc.cpp7
2 files changed, 9 insertions, 0 deletions
diff --git a/src/tools/moc/preprocessor.cpp b/src/tools/moc/preprocessor.cpp
index 07986a71e6..091f62b379 100644
--- a/src/tools/moc/preprocessor.cpp
+++ b/src/tools/moc/preprocessor.cpp
@@ -915,6 +915,8 @@ void Preprocessor::preprocess(const QByteArray &filename, Symbols &preprocessed)
case PP_ENDIF:
until(PP_NEWLINE);
continue;
+ case PP_NEWLINE:
+ continue;
case SIGNALS:
case SLOTS: {
Symbol sym = symbol();
diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp
index 49095048bf..ecd9dc599e 100644
--- a/tests/auto/tools/moc/tst_moc.cpp
+++ b/tests/auto/tools/moc/tst_moc.cpp
@@ -368,6 +368,13 @@ signals:
void signalInIf3();
#endif
+# //QTBUG-22717
+ # /* */
+#
+
+ # \
+
+//
public slots:
void const slotWithSillyConst() {}