Merge branch 'master' of ../../qt into kinetic-declarativeui

Conflicts:
	src/corelib/kernel/kernel.pri
	src/corelib/kernel/qabstractitemmodel.cpp
	src/corelib/kernel/qmetaobject.cpp
	src/corelib/kernel/qmetaobject.h

4 files changed, 6 insertions, 16 deletions

diff --git a/src/corelib/kernel/qabstractitemmodel.cpp b/src/corelib/kernel/qabstractitemmodel.cpp
index 3dfa4d3..80da80e 100644
--- a/src/corelib/kernel/qabstractitemmodel.cpp
+++ b/src/corelib/kernel/qabstractitemmodel.cpp
@@ -481,11 +481,11 @@ namespace {
     };
 }
 
-Q_GLOBAL_STATIC(DefaultRoleNames, defaultRoleNames);
+Q_GLOBAL_STATIC(DefaultRoleNames, qDefaultRoleNames)
 
 const QHash<int,QByteArray> &QAbstractItemModelPrivate::defaultRoleNames()
 {
-    return *::defaultRoleNames();
+    return *qDefaultRoleNames();
 }
 
 /*!
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp
index fc17e00..06af451 100644
--- a/src/corelib/kernel/qmetaobject.cpp
+++ b/src/corelib/kernel/qmetaobject.cpp
@@ -148,7 +148,9 @@ enum PropertyFlags  {
     Resettable = 0x00000004,
     EnumOrFlag = 0x00000008,
     StdCppSet = 0x00000100,
-//    Override = 0x00000200,
+//     Override = 0x00000200,
+    Constant = 0x00000400,
+    Final = 0x00000800,
     Designable = 0x00001000,
     ResolveDesignable = 0x00002000,
     Scriptable = 0x00004000,
@@ -2485,17 +2487,6 @@ bool QMetaProperty::isUser(const QObject *object) const
 }
 
 /*!
-    \internal
-*/
-bool QMetaProperty::isDynamic() const
-{
-    if (!mobj)
-        return false;
-    int flags = mobj->d.data[handle + 2];
-    return flags & Dynamic;
-}
-
-/*!
     Returns true if the property is constant; otherwise returns false.
 
     A property is constant if the \c{Q_PROPERTY()}'s \c CONSTANT attribute
diff --git a/src/corelib/kernel/qmetaobject.h b/src/corelib/kernel/qmetaobject.h
index 9f36106..419fe06 100644
--- a/src/corelib/kernel/qmetaobject.h
+++ b/src/corelib/kernel/qmetaobject.h
@@ -189,7 +189,6 @@ public:
     bool isStored(const QObject *obj = 0) const;
     bool isEditable(const QObject *obj = 0) const;
     bool isUser(const QObject *obj = 0) const;
-    bool isDynamic() const;
     bool isConstant() const;
     bool isFinal() const;
 
diff --git a/src/corelib/tools/qshareddata.cpp b/src/corelib/tools/qshareddata.cpp
index 3cd37a7..6cd220c 100644
--- a/src/corelib/tools/qshareddata.cpp
+++ b/src/corelib/tools/qshareddata.cpp
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 
   QSharedData is designed to be used with QSharedDataPointer or
   QExplicitlySharedDataPointer to implement custom \l{implicitly
-  shared} or \l {explicitly shared} classes. QSharedData provides
+  shared} or explicitly shared classes. QSharedData provides
   \l{thread-safe} reference counting.
 
  See QSharedDataPointer and QExplicitlySharedDataPointer for details.