diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-23 06:43:41 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-23 06:43:41 (GMT) |
| commit | 3db40b0be40c946f547f238ed3f0af813892115e (patch) | |
| tree | ced28fa59d5d99e26635776264d7dfef28c395b6 /src/declarative | |
| parent | 127df63bbce367e7e2d77ae9f219feb5a4a2560e (diff) | |
| parent | 57cc5c50df4fc3673c948e8a55b4bab991e9cb7f (diff) | |
| download | Qt-3db40b0be40c946f547f238ed3f0af813892115e.zip Qt-3db40b0be40c946f547f238ed3f0af813892115e.tar.gz Qt-3db40b0be40c946f547f238ed3f0af813892115e.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
clean up x11 desktop detection
avoid double reallocations in inserting operations
create temporaries more intelligently
do not protect against self-assignment in QList::replace()
make queues to which only lists are appended not blow the memory
optimize queue-like structures
remove more pointless recalculations
Fix compilation with namespace.
Fix compilation with namespace.
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/qml/qml.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qml.h b/src/declarative/qml/qml.h index 7972305..163d198 100644 --- a/src/declarative/qml/qml.h +++ b/src/declarative/qml/qml.h @@ -55,8 +55,6 @@ QT_BEGIN_HEADER -QT_MODULE(Declarative) - #define QML_DECLARE_TYPE(TYPE) \ Q_DECLARE_METATYPE(TYPE *) \ Q_DECLARE_METATYPE(QmlListProperty<TYPE>) @@ -88,6 +86,8 @@ QT_END_NAMESPACE QT_BEGIN_NAMESPACE +QT_MODULE(Declarative) + #if defined(Q_OS_SYMBIAN) #define QML_DEFINE_INTERFACE(INTERFACE) \ static int defineInterface##INTERFACE = qmlRegisterInterface<INTERFACE>(#INTERFACE); |