summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-07-27 22:28:13 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-07-27 22:28:13 (GMT)
commitfa475c4c783c8b711134247d4c1a7ae5c909dcf2 (patch)
tree6a41524067c2292ff94dec024ae8ebb4dfcdc089
parent054032cb8329e387a03cc3dddee66b302890c567 (diff)
downloadQt-fa475c4c783c8b711134247d4c1a7ae5c909dcf2.zip
Qt-fa475c4c783c8b711134247d4c1a7ae5c909dcf2.tar.gz
Qt-fa475c4c783c8b711134247d4c1a7ae5c909dcf2.tar.bz2
Compile after merge.
-rw-r--r--src/declarative/qml/qmlmetaproperty_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlmetaproperty_p.h b/src/declarative/qml/qmlmetaproperty_p.h
index d135eda..64cdbae 100644
--- a/src/declarative/qml/qmlmetaproperty_p.h
+++ b/src/declarative/qml/qmlmetaproperty_p.h
@@ -54,7 +54,7 @@
//
#include "qmlmetaproperty.h"
-#include "private/qguard_p.h"
+#include "private/qobject_p.h"
QT_BEGIN_NAMESPACE