summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativeinfo.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-04-15 04:07:13 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-04-15 04:07:13 (GMT)
commita7fe2b895980ef203631d15375f175e25b9ca6a9 (patch)
treeef7a39c0380a92e6e91ab03a3404efe70885612d /src/declarative/qml/qdeclarativeinfo.cpp
parenta21bd329e4ba9b0e67931ea5a635088afda58eb5 (diff)
downloadQt-a7fe2b895980ef203631d15375f175e25b9ca6a9.zip
Qt-a7fe2b895980ef203631d15375f175e25b9ca6a9.tar.gz
Qt-a7fe2b895980ef203631d15375f175e25b9ca6a9.tar.bz2
Rename the ridiculous QDeclarativeDeclarativeData -> QDeclarativeData
Diffstat (limited to 'src/declarative/qml/qdeclarativeinfo.cpp')
-rw-r--r--src/declarative/qml/qdeclarativeinfo.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativeinfo.cpp b/src/declarative/qml/qdeclarativeinfo.cpp
index 6199aa9..0a4352f 100644
--- a/src/declarative/qml/qdeclarativeinfo.cpp
+++ b/src/declarative/qml/qdeclarativeinfo.cpp
@@ -41,7 +41,7 @@
#include "qdeclarativeinfo.h"
-#include "private/qdeclarativedeclarativedata_p.h"
+#include "private/qdeclarativedata_p.h"
#include "qdeclarativecontext.h"
#include "private/qdeclarativecontext_p.h"
#include "private/qdeclarativemetatype_p.h"
@@ -100,7 +100,7 @@ QDeclarativeInfo::QDeclarativeInfo(const QObject *object)
pos += typeName;
}
- QDeclarativeDeclarativeData *ddata = object?QDeclarativeDeclarativeData::get(object):0;
+ QDeclarativeData *ddata = object?QDeclarativeData::get(object):0;
pos += QLatin1String(" (");
if (ddata) {
if (ddata->outerContext && !ddata->outerContext->url.isEmpty()) {