From 02a53eae69b7938c142739bd019b962d62560d52 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@digia.com>
Date: Mon, 1 Sep 2014 10:43:01 +0200
Subject: 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>
---
 src/qml/qml/qqmlvme_p.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/qml/qml')

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;
 };
 
-- 
cgit v1.2.3