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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits)
  Make QTextControl-based classes and QLineEdit understand Ctrl+Shift+Insert
  Compile
  QtScript: Improve performance of type resolution when calling slots
  Improve performance of QScriptValueIterator
  Add default argument values for QScriptValuePrivate property functions
  Move method implementation to private class
  Add benchmarks for QScriptValueIterator
  Fixed the QML browser built into the QML viewer
  Make configure.exe fail for declarative if no script support
  Add QWidget::update() test.
  Add license headers
  Import static contents tests from old manualtests
  Fix Build Failure for Maemo 5 Debug Build
  Add ability to read last mod.time for zip entry.
  Avoid asserting when index passed to QZipReader::entryInfoAt is out of boundaries
  Add isValid() method to QZipReader::FileInfo.
  Add `QIODevice* device() const` public method to QZip classes.
  Rebuild configure.exe (again enable QtDeclarative module by default)
  Update src/3rdparty/javascriptcore and adapt src/script to the changes
  Use index-based approach for iterating over JS array properties
  ...

4 files changed, 35 insertions, 29 deletions

diff --git a/tools/assistant/tools/assistant/helpenginewrapper.cpp b/tools/assistant/tools/assistant/helpenginewrapper.cpp
index 41ad633..9748702 100644
--- a/tools/assistant/tools/assistant/helpenginewrapper.cpp
+++ b/tools/assistant/tools/assistant/helpenginewrapper.cpp
@@ -112,7 +112,6 @@ private:
     QFileSystemWatcher * const m_qchWatcher;
     typedef QPair<QDateTime, QSharedPointer<TimeoutForwarder> > RecentSignal;
     QMap<QString, RecentSignal> m_recentQchUpdates;
-    bool m_initialReindexingNeeded;
 };
 
 const QString HelpEngineWrapper::TrUnfiltered = tr("Unfiltered");
@@ -182,8 +181,7 @@ void HelpEngineWrapper::initialDocSetupDone()
     TRACE_OBJ
     connect(d->m_helpEngine, SIGNAL(setupFinished()),
             searchEngine(), SLOT(indexDocumentation()));
-    if (d->m_initialReindexingNeeded)
-        setupData();
+    setupData();
 }
 
 QHelpSearchEngine *HelpEngineWrapper::searchEngine() const
@@ -236,7 +234,6 @@ bool HelpEngineWrapper::registerDocumentation(const QString &docFile)
         return false;
     d->m_qchWatcher->addPath(docFile);
     d->checkDocFilesWatched();
-    d->m_initialReindexingNeeded = true;
     return true;
 }
 
@@ -249,7 +246,6 @@ bool HelpEngineWrapper::unregisterDocumentation(const QString &namespaceName)
         return false;
     d->m_qchWatcher->removePath(file);
     d->checkDocFilesWatched();
-    d->m_initialReindexingNeeded = true;
     return true;
 }
 
@@ -729,8 +725,7 @@ void TimeoutForwarder::forward()
 
 HelpEngineWrapperPrivate::HelpEngineWrapperPrivate(const QString &collectionFile)
     : m_helpEngine(new QHelpEngine(collectionFile, this)),
-      m_qchWatcher(new QFileSystemWatcher(this)),
-      m_initialReindexingNeeded(false)
+      m_qchWatcher(new QFileSystemWatcher(this))
 {
     TRACE_OBJ
     if (!m_helpEngine->customFilters().contains(Unfiltered))
@@ -829,7 +824,6 @@ void HelpEngineWrapperPrivate::qchFileChanged(const QString &fileName,
         } else {
             emit documentationUpdated(ns);
         }
-        m_initialReindexingNeeded = true;
         m_helpEngine->setupData();
     }
     m_recentQchUpdates.erase(it);
diff --git a/tools/assistant/tools/assistant/mainwindow.cpp b/tools/assistant/tools/assistant/mainwindow.cpp
index 687e6bc..c403aa7 100644
--- a/tools/assistant/tools/assistant/mainwindow.cpp
+++ b/tools/assistant/tools/assistant/mainwindow.cpp
@@ -361,6 +361,7 @@ void MainWindow::qtDocumentationInstalled()
 void MainWindow::checkInitState()
 {
     TRACE_OBJ
+    HelpEngineWrapper::instance().initialDocSetupDone();
     if (!m_cmdLine->enableRemoteControl())
         return;
 
@@ -381,7 +382,6 @@ void MainWindow::checkInitState()
         }
         emit initDone();
     }
-    HelpEngineWrapper::instance().initialDocSetupDone();
 }
 
 void MainWindow::insertLastPages()
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 6b7740e..44d5f58 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2081,12 +2081,10 @@ bool Configure::checkAvailability(const QString &part)
         }
     } else if (part == "WMSDK") {
         available = findFile("wmsdk.h");
-    } else if (part == "MULTIMEDIA" || part == "SCRIPT" || part == "SCRIPTTOOLS") {
+    } else if (part == "MULTIMEDIA" || part == "SCRIPT" || part == "SCRIPTTOOLS" || part == "DECLARATIVE") {
         available = true;
     } else if (part == "WEBKIT") {
         available = (dictionary.value("QMAKESPEC") == "win32-msvc2005") || (dictionary.value("QMAKESPEC") == "win32-msvc2008") || (dictionary.value("QMAKESPEC") == "win32-g++");
-    } else if (part == "DECLARATIVE") {
-        available = QFile::exists(sourcePath + "/src/declarative/qml/qdeclarativecomponent.h");
     } else if (part == "AUDIO_BACKEND") {
         available = true;
         if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith("symbian")) {
@@ -2212,7 +2210,7 @@ void Configure::autoDetection()
     if (dictionary["SCRIPT"] == "auto")
         dictionary["SCRIPT"] = checkAvailability("SCRIPT") ? "yes" : "no";
     if (dictionary["SCRIPTTOOLS"] == "auto")
-        dictionary["SCRIPTTOOLS"] = checkAvailability("SCRIPTTOOLS") ? "yes" : "no";
+        dictionary["SCRIPTTOOLS"] = dictionary["SCRIPT"] == "yes" ? "yes" : "no";
     if (dictionary["XMLPATTERNS"] == "auto")
         dictionary["XMLPATTERNS"] = checkAvailability("XMLPATTERNS") ? "yes" : "no";
     if (dictionary["PHONON"] == "auto")
@@ -2220,7 +2218,7 @@ void Configure::autoDetection()
     if (dictionary["WEBKIT"] == "auto")
         dictionary["WEBKIT"] = checkAvailability("WEBKIT") ? "yes" : "no";
     if (dictionary["DECLARATIVE"] == "auto")
-        dictionary["DECLARATIVE"] = checkAvailability("DECLARATIVE") ? "yes" : "no";
+        dictionary["DECLARATIVE"] = dictionary["SCRIPT"] == "yes" ? "yes" : "no";
     if (dictionary["AUDIO_BACKEND"] == "auto")
         dictionary["AUDIO_BACKEND"] = checkAvailability("AUDIO_BACKEND") ? "yes" : "no";
     if (dictionary["MEDIASERVICE"] == "auto")
@@ -2270,15 +2268,23 @@ bool Configure::verifyConfiguration()
         if(_getch() == 3) // _Any_ keypress w/no echo(eat <Enter> for stdout)
             exit(0);      // Exit cleanly for Ctrl+C
     }
-	if (0 != dictionary["ARM_FPU_TYPE"].size())
-	{
-		QStringList l= QStringList()
-			<< "softvfp"
-			<< "softvfp+vfpv2"
-			<< "vfpv2";
-		if (!(l.contains(dictionary["ARM_FPU_TYPE"])))
-			cout << QString("WARNING: Using unsupported fpu flag: %1").arg(dictionary["ARM_FPU_TYPE"]) << endl;
-	}
+    if (0 != dictionary["ARM_FPU_TYPE"].size()) {
+            QStringList l= QStringList()
+                    << "softvfp"
+                    << "softvfp+vfpv2"
+                    << "vfpv2";
+            if (!(l.contains(dictionary["ARM_FPU_TYPE"])))
+                    cout << QString("WARNING: Using unsupported fpu flag: %1").arg(dictionary["ARM_FPU_TYPE"]) << endl;
+    }
+    if (dictionary["DECLARATIVE"] == "yes" && dictionary["SCRIPT"] != "no") {
+        cout << "WARNING: To be able to compile QtDeclarative we need to also compile the" << endl
+             << "QtScript module. If you continue, we will turn on the QtScript module." << endl
+             << "(Press any key to continue..)";
+        if(_getch() == 3) // _Any_ keypress w/no echo(eat <Enter> for stdout)
+            exit(0);      // Exit cleanly for Ctrl+C
+
+        dictionary["SCRIPT"] = "yes";
+    }
 
     return true;
 }
@@ -2627,8 +2633,14 @@ void Configure::generateOutputVars()
     if (dictionary["WEBKIT"] == "yes")
         qtConfig += "webkit";
 
-    if (dictionary["DECLARATIVE"] == "yes")
+    if (dictionary["DECLARATIVE"] == "yes") {
+        if (dictionary[ "SCRIPT" ] == "no") {
+            cout << "QtDeclarative was requested, but it can't be built due to QtScript being "
+                    "disabled." << endl;
+            dictionary[ "DONE" ] = "error";
+        }
         qtConfig += "declarative";
+    }
 
     if( dictionary[ "NATIVE_GESTURES" ] == "yes" )
         qtConfig += "native-gestures";
diff --git a/tools/qml/content/Browser.qml b/tools/qml/content/Browser.qml
index 35120bc..62996ef 100644
--- a/tools/qml/content/Browser.qml
+++ b/tools/qml/content/Browser.qml
@@ -137,12 +137,12 @@ Rectangle {
             Transition {
                 to: "current"
                 SequentialAnimation {
-                    NumberAnimation { matchProperties: "x"; duration: 250 }
+                    NumberAnimation { properties: "x"; duration: 250 }
                 }
             },
             Transition {
-                NumberAnimation { matchProperties: "x"; duration: 250 }
-                NumberAnimation { matchProperties: "x"; duration: 250 }
+                NumberAnimation { properties: "x"; duration: 250 }
+                NumberAnimation { properties: "x"; duration: 250 }
             }
         ]
         Keys.onPressed: { root.keyPressed = true; }
@@ -177,11 +177,11 @@ Rectangle {
             Transition {
                 to: "current"
                 SequentialAnimation {
-                    NumberAnimation { matchProperties: "x"; duration: 250 }
+                    NumberAnimation { properties: "x"; duration: 250 }
                 }
             },
             Transition {
-                NumberAnimation { matchProperties: "x"; duration: 250 }
+                NumberAnimation { properties: "x"; duration: 250 }
             }
         ]
         Keys.onPressed: { root.keyPressed = true; }