Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7

7 files changed, 15 insertions, 10 deletions

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 1b77058..be44646 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -752,7 +752,7 @@ void Configure::parseCmdLine()
             } else if ( configCmdLine.at(i) == "es2" ) {
                 dictionary[ "OPENGL_ES_2" ]     = "yes";
             } else if ( configCmdLine.at(i) == "desktop" ) {
-                dictionary[ "OPENGL_ES_2" ]     = "yes";
+                // OPENGL=yes suffices
             } else {
                 cout << "Argument passed to -opengl option is not valid." << endl;
                 dictionary[ "DONE" ] = "error";
diff --git a/tools/linguist/shared/qm.cpp b/tools/linguist/shared/qm.cpp
index 7b30643..0b4bd9e 100644
--- a/tools/linguist/shared/qm.cpp
+++ b/tools/linguist/shared/qm.cpp
@@ -723,7 +723,7 @@ static bool saveQM(const Translator &translator, QIODevice &dev, ConversionData
                 continue;
             }
             if (typ == TranslatorMessage::Unfinished) {
-                if (!cd.m_idBased && msg.translation().isEmpty()) {
+                if (msg.translation().isEmpty() && !cd.m_idBased && cd.m_unTrPrefix.isEmpty()) {
                     ++untranslated;
                     continue;
                 } else {
diff --git a/tools/linguist/shared/ts.cpp b/tools/linguist/shared/ts.cpp
index 85be5c6..4523bc5 100644
--- a/tools/linguist/shared/ts.cpp
+++ b/tools/linguist/shared/ts.cpp
@@ -264,6 +264,7 @@ bool TSReader::read(Translator &translator)
             //qDebug() << "TS " << attributes();
             QHash<QString, int> currentLine;
             QString currentFile;
+            bool maybeRelative = false, maybeAbsolute = false;
 
             QXmlStreamAttributes atts = attributes();
             //QString version = atts.value(strversion).toString();
@@ -342,10 +343,12 @@ bool TSReader::read(Translator &translator)
                                     msg.setTranslatorComment(readContents());
                                 } else if (elementStarts(strlocation)) {
                                     // <location/>
+                                    maybeAbsolute = true;
                                     QXmlStreamAttributes atts = attributes();
                                     QString fileName = atts.value(strfilename).toString();
                                     if (fileName.isEmpty()) {
                                         fileName = currentMsgFile;
+                                        maybeRelative = true;
                                     } else {
                                         if (refs.isEmpty())
                                             currentFile = fileName;
@@ -353,7 +356,6 @@ bool TSReader::read(Translator &translator)
                                     }
                                     const QString lin = atts.value(strline).toString();
                                     if (lin.isEmpty()) {
-                                        translator.setLocationsType(Translator::RelativeLocations);
                                         refs.append(TranslatorMessage::Reference(fileName, -1));
                                     } else {
                                         bool bOK;
@@ -361,9 +363,7 @@ bool TSReader::read(Translator &translator)
                                         if (bOK) {
                                             if (lin.startsWith(QLatin1Char('+')) || lin.startsWith(QLatin1Char('-'))) {
                                                 lineNo = (currentLine[fileName] += lineNo);
-                                                translator.setLocationsType(Translator::RelativeLocations);
-                                            } else {
-                                                translator.setLocationsType(Translator::AbsoluteLocations);
+                                                maybeRelative = true;
                                             }
                                             refs.append(TranslatorMessage::Reference(fileName, lineNo));
                                         }
@@ -422,6 +422,9 @@ bool TSReader::read(Translator &translator)
                 } else {
                     handleError();
                 }
+                translator.setLocationsType(maybeRelative ? Translator::RelativeLocations :
+                                            maybeAbsolute ? Translator::AbsoluteLocations :
+                                                            Translator::NoLocations);
             } // </TS>
         } else {
             handleError();
@@ -727,7 +730,6 @@ bool saveTS(const Translator &translator, QIODevice &dev, ConversionData &cd, in
 
 bool loadTS(Translator &translator, QIODevice &dev, ConversionData &cd)
 {
-    translator.setLocationsType(Translator::NoLocations);
     TSReader reader(dev, cd);
     return reader.read(translator);
 }
diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro
index 3596349..bb5ff83 100644
--- a/tools/qdoc3/qdoc3.pro
+++ b/tools/qdoc3/qdoc3.pro
@@ -95,7 +95,7 @@ include(declarativeparser/parser.pri)
 qtPrepareTool(QDOC, qdoc3)
 qtPrepareTool(QHELPGENERATOR, qhelpgenerator)
 
-$$unixstyle {
+equals(QMAKE_DIR_SEP, /) {
     QDOC = QT_BUILD_TREE=$$QT_BUILD_TREE QT_SOURCE_TREE=$$QT_SOURCE_TREE $$QDOC
 } else {
     QDOC = set QT_BUILD_TREE=$$QT_BUILD_TREE&& set QT_SOURCE_TREE=$$QT_SOURCE_TREE&& $$QDOC
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 6ca6bfb..b2c7f4f 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -51,6 +51,7 @@
 #include <QMessageBox>
 #include <QAtomicInt>
 #include "qdeclarativetester.h"
+#include <private/qdeclarativedebughelper_p.h>
 
 QT_USE_NAMESPACE
 
@@ -538,6 +539,8 @@ int main(int argc, char ** argv)
         QApplication::setGraphicsSystem("raster");
 #endif
 
+    QDeclarativeDebugHelper::enableDebugging();
+
     Application app(argc, argv);
     app.setApplicationName("QtQmlViewer");
     app.setOrganizationName("Nokia");
diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro
index b1d56ea..84ebba8 100644
--- a/tools/qml/qml.pro
+++ b/tools/qml/qml.pro
@@ -39,7 +39,7 @@ symbian {
     TARGET.CAPABILITY = NetworkServices ReadUserData
 
     # Deploy plugin for remote debugging
-    qmldebuggingplugin.sources = $$QT_BUILD_TREE/plugins/qmltooling/tcpserver$${QT_LIBINFIX}.dll
+    qmldebuggingplugin.sources = $$QT_BUILD_TREE/plugins/qmltooling/qmldbg_tcp$${QT_LIBINFIX}.dll  $$QT_BUILD_TREE/plugins/qmltooling/qmldbg_ost$${QT_LIBINFIX}.dll 
     qmldebuggingplugin.path = c:$$QT_PLUGINS_BASE_DIR/qmltooling
     DEPLOYMENT +=  qmldebuggingplugin
 }
diff --git a/tools/qml/startup/startup.qml b/tools/qml/startup/startup.qml
index fae7401..a216ac6 100644
--- a/tools/qml/startup/startup.qml
+++ b/tools/qml/startup/startup.qml
@@ -90,7 +90,7 @@ Rectangle {
                 NumberAnimation on rotation {
                     from: 0
                     to: 360
-                    loops: NumberAnimation.Infinite
+                    loops: 3
                     running: true
                     duration: 2000
                 }