Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (147 commits)
  doc fixes
  Don't test XmlListModel examples on platforms without QtXmlPatterns
  More error output for QML_IMPORT_TRACE=1
  Fix declarative examples autotest, avoid using native separators
  Doc: update Rectangle smooth painting screenshot.
  Add some TextInput properties and methods
  Remove GraphicsObjectContainer from the documentation.
  import Qt 4.6 -> import Qt 4.7
  Move documentation code to snippet.
  Test fix.
  Fix test
  Fix test on QWS.
  Fix PathView crash.
  Make bindings dump more useful
  Improve font value type documentation.
  coding conventions
  Doc fixes
  Warning
  Read Maemo orientation at startup
  Exclude gestures from examples autotest
  ...

3 files changed, 11 insertions, 6 deletions

diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index 9490225..3515777 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -329,6 +329,10 @@ QLibraryInfo::location(LibraryLocation loc)
             key = QLatin1String("Plugins");
             defaultValue = QLatin1String("plugins");
             break;
+        case ImportsPath:
+            key = QLatin1String("Imports");
+            defaultValue = QLatin1String("imports");
+            break;
         case DataPath:
             key = QLatin1String("Data");
             break;
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 330de20..411f22e 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -125,8 +125,10 @@ extern "C" Q_CORE_EXPORT void qt_removeObject(QObject *)
     }
 }
 
+void (*QDeclarativeData::destroyed)(QDeclarativeData *, QObject *) = 0;
+void (*QDeclarativeData::parentChanged)(QDeclarativeData *, QObject *, QObject *) = 0;
+
 QObjectData::~QObjectData() {}
-QDeclarativeData::~QDeclarativeData() {}
 
 QObjectPrivate::QObjectPrivate(int version)
     : threadData(0), connectionLists(0), senders(0), currentSender(0), currentChildBeingDeleted(0)
@@ -876,7 +878,7 @@ QObject::~QObject()
     }
 
     if (d->declarativeData)
-        d->declarativeData->destroyed(this);
+        QDeclarativeData::destroyed(d->declarativeData, this);
 
     {
         QMutex *signalSlotMutex = 0;
@@ -2025,7 +2027,7 @@ void QObjectPrivate::setParent_helper(QObject *o)
         }
     }
     if (!wasDeleted && declarativeData)
-        declarativeData->parentChanged(q, o);
+        QDeclarativeData::parentChanged(declarativeData, q, o);
 }
 
 /*!
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
index 3b59abb..e5d904c 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -87,9 +87,8 @@ enum { QObjectPrivateVersion = QT_VERSION };
 class Q_CORE_EXPORT QDeclarativeData
 {
 public:
-    virtual ~QDeclarativeData();
-    virtual void destroyed(QObject *) = 0;
-    virtual void parentChanged(QObject *, QObject *) = 0;
+    static void (*destroyed)(QDeclarativeData *, QObject *);
+    static void (*parentChanged)(QDeclarativeData *, QObject *, QObject *);
 };
 
 class Q_CORE_EXPORT QObjectPrivate : public QObjectData