From 2cf099e9f6bd482e9f7e938ccd949c5b5e6aea95 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 3 May 2016 23:07:17 -0700 Subject: [PATCH] tst_Moc: restore signals/slots/emit to the Q_UPPERCASE values The previous definition of signals does not need to be "public". It may have been something else. Change-Id: Id69569111e7d4e619e22ffff144b4855e6acdbef Reviewed-by: Olivier Goffart (Woboq GmbH) --- tests/auto/tools/moc/no-keywords.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/auto/tools/moc/no-keywords.h b/tests/auto/tools/moc/no-keywords.h index 56a906e6a9..d31063665b 100644 --- a/tests/auto/tools/moc/no-keywords.h +++ b/tests/auto/tools/moc/no-keywords.h @@ -70,9 +70,9 @@ private: double slots; }; -#define signals public -#define slots -#define emit +#define signals Q_SIGNALS +#define slots Q_SLOTS +#define emit Q_EMIT #undef QT_NO_KEYWORDS #endif // NO_KEYWORDS_H