From 08535a7e6308c688924ea503a00cb807812197a8 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 4 Feb 2022 12:15:45 +0100 Subject: Make share/qtcreator/cplusplus/examples compilable Builds now, but does not link (which is fine). And unrelated, unintentional warnings were removed. Change-Id: I6ece33933bc20e6e36fb3859de7c2b774b0e67d5 Reviewed-by: Reviewed-by: Cristian Adam --- share/qtcreator/cplusplus/examples/icontest.cpp | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'share/qtcreator/cplusplus/examples/icontest.cpp') diff --git a/share/qtcreator/cplusplus/examples/icontest.cpp b/share/qtcreator/cplusplus/examples/icontest.cpp index 2aea615fd2..764c920b93 100644 --- a/share/qtcreator/cplusplus/examples/icontest.cpp +++ b/share/qtcreator/cplusplus/examples/icontest.cpp @@ -27,12 +27,13 @@ #define Macro -class Class { +class Class : public QObject { Q_OBJECT + public: - Q_PROPERTY(bool property READ readProperty CONSTANT); - void publicFunction(); - void static publicStaticFunction(); + Q_PROPERTY(int property READ publicStaticFunction CONSTANT) + int publicFunction() { return 0; } + int static publicStaticFunction() { return 0; } template void publicTemplateFunction(); template void static publicStaticTemplateFunction(); @@ -43,8 +44,8 @@ signals: void signal(); public slots: - void publicSlot(); - template void publicTemplateSlot(); + void publicSlot() {} + // template void publicTemplateSlot() {} protected: void protectedFunction(); @@ -56,8 +57,8 @@ protected: int static protectedStaticVariable; protected slots: - void protectedSlot(); - template void protectedTemplateSlot(); + void protectedSlot() {} + // template void protectedTemplateSlot() {} private: void privateFunction(); @@ -67,9 +68,10 @@ private: template void static privateStaticTemplateFunction(); private slots: - void privateSlot(); - template void privateTemplateSlot(); + void privateSlot() {} + // template void privateTemplateSlot() {} +private: int privateVariable; int static privateStaticVariable; }; -- cgit v1.2.1