From 1ff1288c04e8ae531ed3b405e4c2f826119160d5 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 6 Jan 2012 13:18:35 +0100 Subject: [PATCH] Make QUuid a class. Silence MSVC warnings about forward-declarations as class in the metatype system. Change-Id: I676662e5919585e98c87413fd8360d6f41f73631 Reviewed-by: Denis Dzyubenko --- qmake/generators/win32/msvc_vcproj.h | 2 +- src/corelib/plugin/quuid.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/qmake/generators/win32/msvc_vcproj.h b/qmake/generators/win32/msvc_vcproj.h index b58550743c..5bb6b2d85f 100644 --- a/qmake/generators/win32/msvc_vcproj.h +++ b/qmake/generators/win32/msvc_vcproj.h @@ -53,7 +53,7 @@ enum Target { StaticLib }; -struct QUuid; +class QUuid; class VcprojGenerator : public Win32MakefileGenerator { bool init_flag; diff --git a/src/corelib/plugin/quuid.h b/src/corelib/plugin/quuid.h index 85691d94c0..e7cc919ad5 100644 --- a/src/corelib/plugin/quuid.h +++ b/src/corelib/plugin/quuid.h @@ -64,8 +64,9 @@ QT_BEGIN_NAMESPACE QT_MODULE(Core) -struct Q_CORE_EXPORT QUuid +class Q_CORE_EXPORT QUuid { +public: enum Variant { VarUnknown =-1, NCS = 0, // 0 - -