summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorck <qt-info@nokia.com>2010-03-01 13:13:45 (GMT)
committerck <qt-info@nokia.com>2010-03-01 13:14:27 (GMT)
commit82e224ee5e5388e8b5be186db6a60339e7b8fba3 (patch)
tree09f27b81abd99d0a8d581f29320d774f55c5871e
parent9fe43ff4e313220a1ecb02a990324cb6b768e585 (diff)
downloadQt-82e224ee5e5388e8b5be186db6a60339e7b8fba3.zip
Qt-82e224ee5e5388e8b5be186db6a60339e7b8fba3.tar.gz
Qt-82e224ee5e5388e8b5be186db6a60339e7b8fba3.tar.bz2
Fix compilation with namespace.
-rw-r--r--src/corelib/tools/qsimd_p.h4
-rw-r--r--src/declarative/qml/qdeclarativebinding_p.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h
index 44c1798..53593aa 100644
--- a/src/corelib/tools/qsimd_p.h
+++ b/src/corelib/tools/qsimd_p.h
@@ -117,10 +117,10 @@ enum CPUFeatures {
};
+Q_CORE_EXPORT uint qDetectCPUFeatures();
+
QT_END_NAMESPACE
QT_END_HEADER
-Q_CORE_EXPORT uint qDetectCPUFeatures();
-
#endif // QSIMD_P_H
diff --git a/src/declarative/qml/qdeclarativebinding_p.h b/src/declarative/qml/qdeclarativebinding_p.h
index f66b9c7..ec5809d 100644
--- a/src/declarative/qml/qdeclarativebinding_p.h
+++ b/src/declarative/qml/qdeclarativebinding_p.h
@@ -130,8 +130,9 @@ protected:
private:
Q_DECLARE_PRIVATE(QDeclarativeBinding)
};
-Q_DECLARE_METATYPE(QDeclarativeBinding*);
QT_END_NAMESPACE
+Q_DECLARE_METATYPE(QDeclarativeBinding*);
+
#endif // QDECLARATIVEBINDING_P_H