diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-03 15:43:39 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-03 15:43:39 +0200 |
| commit | a4121a21c010d8b9d3a80d9c4cfe5e5c72f5f0fa (patch) | |
| tree | c2618ca887eb02f5069c5577440881e6aa1150f6 /src/tools/uic/qclass_lib_map.h | |
| parent | 448c3e85dddbfc5c101aceeeceb8584a3d41c913 (diff) | |
| parent | e777e3f1ecc72d0958386ac6975c45c8d36081f1 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Icedabda08961326a0a447ec71f1b0f0f5df075eb
Diffstat (limited to 'src/tools/uic/qclass_lib_map.h')
| -rw-r--r-- | src/tools/uic/qclass_lib_map.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/uic/qclass_lib_map.h b/src/tools/uic/qclass_lib_map.h index 075b2d52e8..6859cd0cd4 100644 --- a/src/tools/uic/qclass_lib_map.h +++ b/src/tools/uic/qclass_lib_map.h @@ -313,7 +313,7 @@ QT_CLASS_LIB(QDeclarativePropertyValueInterceptor, QtDeclarative, qdeclarativepr QT_CLASS_LIB(QDeclarativePropertyValueSource, QtDeclarative, qdeclarativepropertyvaluesource.h) QT_CLASS_LIB(QDeclarativeScriptString, QtDeclarative, qdeclarativescriptstring.h) QT_CLASS_LIB(QDeclarativePropertyMap, QtDeclarative, qdeclarativepropertymap.h) -QT_CLASS_LIB(QDeclarativeView, QtQuick1, qdeclarativeview.h) +QT_CLASS_LIB(QDeclarativeView, QtDeclarative, qdeclarativeview.h) QT_CLASS_LIB(QMacGLCompatTypes, QtOpenGL, qgl.h) QT_CLASS_LIB(QMacGLCompatTypes, QtOpenGL, qgl.h) QT_CLASS_LIB(QMacCompatGLint, QtOpenGL, qgl.h) |