From 864910a1fb753629d2852a91ffae4ebba374358c Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 15 Oct 2013 08:52:25 +0200 Subject: fix trackers for qt5 Assorted changes: - make filenames unique, since automoc made a boo-boo - adjust include paths, "QtGui" -> "" - use std::shared_ptr in c++11 mode (thanks Patrick!) - make class names unique, automoc sucks, but saves typing - add a dummy class in one file since moronic automoc thinks every target contains Q_OBJECTS!!! --- facetracknoir/qt-moc.h | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 facetracknoir/qt-moc.h (limited to 'facetracknoir/qt-moc.h') diff --git a/facetracknoir/qt-moc.h b/facetracknoir/qt-moc.h new file mode 100644 index 00000000..467370f9 --- /dev/null +++ b/facetracknoir/qt-moc.h @@ -0,0 +1,10 @@ +#include + +// this file exists only such that cmake qt automoc is appeased + +class AutomocMe { + Q_OBJECT +private: + virtual void foo() = 0; + AutomocMe() = delete; +}; -- cgit v1.2.3 From e58fb06ebc274a684712a7cb80028f3d2ec7757b Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 15 Oct 2013 12:02:29 +0200 Subject: fix MSVC 2010 build somewhat (?) --- facetracknoir/qt-moc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'facetracknoir/qt-moc.h') diff --git a/facetracknoir/qt-moc.h b/facetracknoir/qt-moc.h index 467370f9..6f6033b2 100644 --- a/facetracknoir/qt-moc.h +++ b/facetracknoir/qt-moc.h @@ -6,5 +6,5 @@ class AutomocMe { Q_OBJECT private: virtual void foo() = 0; - AutomocMe() = delete; + AutomocMe() {} }; -- cgit v1.2.3 From 941b72e0124d4a242b3a01b648be29fecbf8b928 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Thu, 24 Oct 2013 17:37:08 +0200 Subject: fix build --- facetracknoir/qt-moc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'facetracknoir/qt-moc.h') diff --git a/facetracknoir/qt-moc.h b/facetracknoir/qt-moc.h index 6f6033b2..8ccfffe8 100644 --- a/facetracknoir/qt-moc.h +++ b/facetracknoir/qt-moc.h @@ -2,7 +2,7 @@ // this file exists only such that cmake qt automoc is appeased -class AutomocMe { +class AutomocMe : public QObject { Q_OBJECT private: virtual void foo() = 0; -- cgit v1.2.3