diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-11-28 21:28:38 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-03 00:58:49 +0100 |
| commit | 828c8230dfc58797becf2869e847eef59581918b (patch) | |
| tree | 0bc5718a1aba50020afff3b3018811ee12bf4806 /src/qml/qml | |
| parent | 70be4dd8a974abcda08cf050e5cec71a58306eec (diff) | |
Add a namespace for a global variable in a public header
The "Qml" prefix should suffice.
This was found by ICC 14.0 in a bogus warning:
qqml.h(470): error #2415: variable "CurrentSingletonTypeRegistrationVersion" of static storage duration was declared but never referenced
Change-Id: I604cd712529b1c4553457c1ea0904182ac4a9e80
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/qqml.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqml.h b/src/qml/qml/qqml.h index b6c6fe840d..641209d1f3 100644 --- a/src/qml/qml/qqml.h +++ b/src/qml/qml/qqml.h @@ -467,7 +467,7 @@ inline int qmlRegisterSingletonType(const char *uri, int versionMajor, int versi return QQmlPrivate::qmlregister(QQmlPrivate::SingletonRegistration, &api); } -static const int CurrentSingletonTypeRegistrationVersion = 2; +enum { QmlCurrentSingletonTypeRegistrationVersion = 2 }; template <typename T> inline int qmlRegisterSingletonType(const char *uri, int versionMajor, int versionMinor, const char *typeName, QObject *(*callback)(QQmlEngine *, QJSEngine *)) @@ -475,7 +475,7 @@ inline int qmlRegisterSingletonType(const char *uri, int versionMajor, int versi QML_GETTYPENAMES QQmlPrivate::RegisterSingletonType api = { - CurrentSingletonTypeRegistrationVersion, + QmlCurrentSingletonTypeRegistrationVersion, uri, versionMajor, versionMinor, typeName, |