aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlvme_p.h
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2014-09-01 10:43:01 +0200
committerKai Koehne <kai.koehne@digia.com>2014-09-01 12:28:45 +0200
commit02a53eae69b7938c142739bd019b962d62560d52 (patch)
tree46015f317cd099de441e1e0e5d6753b819d2343e /src/qml/qml/qqmlvme_p.h
parentac11f250771adaeb8c1af3c46ba894a195db85b5 (diff)
Remove use of anonymous struct in header file
Although all compilers seem to support this, anonymous structs have only been added formally to C++ 11. Also, this breaks with a change that adds a constructor to QElapsedTimer: error: member 'QElapsedTimer QQmlInstantiationInterrupt::<anonymous struct>::timer' with constructor not allowed in anonymous aggregate QElapsedTimer timer; ^ Change-Id: I5672060e3a623a5d9c4eb1d4e2981c67b96a1192 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlvme_p.h')
-rw-r--r--src/qml/qml/qqmlvme_p.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlvme_p.h b/src/qml/qml/qqmlvme_p.h
index daff335088..e819a19ebf 100644
--- a/src/qml/qml/qqmlvme_p.h
+++ b/src/qml/qml/qqmlvme_p.h
@@ -104,10 +104,8 @@ public:
private:
enum Mode { None, Time, Flag };
Mode mode;
- struct {
- QElapsedTimer timer;
- int nsecs;
- };
+ QElapsedTimer timer;
+ int nsecs;
volatile bool *runWhile;
};