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

* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (33 commits)
  Revert readonly BorderImage::sourceSize change
  URLs used with scheme handler use appropriate encoding for scheme
  Fix memory leak in ListModel custom parser
  DEF file update
  If automatic translation of input widget is off, skip reset
  Prevent leakage of native window handles
  QSslCertificate: blacklist fraudulent *.google.com
  Symbian: Not possible to catch RequestSoftwareInputPanel in eventFilter
  Added an additional check to workaround an issue on Windows.
  Exact word bubble doesn't disappear when screen is tapped (fix part 2)
  Exact word bubble doesn't disappear when screen is tapped
  Compile fix for Symbian 5th and earlier
  Symbian: Fix backspace on empty lines of multiline textedits
  Handle CloseSoftwareInputPanel event in QCoeFepInputContext
  Fix delayed password masking mid-string.
  Disabled splitscreen translation still moves screen
  Make text rendering working outside the gui thread on Symbian.
  Fix softkeys cleanup
  Fix clientRect usage in QWidgetPrivate::setGeometry_sys()
  Do not allow fullscreen/maximized windows to expand beyond client rect
  ...

2 files changed, 11 insertions, 5 deletions

diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp
index 0d5b4d3..e3e32a0 100644
--- a/tools/qdoc3/ditaxmlgenerator.cpp
+++ b/tools/qdoc3/ditaxmlgenerator.cpp
@@ -1180,7 +1180,10 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
                   Just output the href as if the image is in
                   the images directory...
                  */
-                fileName = QLatin1String("images/") + protectEnc(atom->string());
+                if (atom->string()[0] == '/')
+                    fileName = QLatin1String("images") + atom->string();
+                else
+                    fileName = QLatin1String("images/") + atom->string();
             }
 
             if (currentTag() != DT_xref)
diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp
index c20d2b4..355c9b2 100644
--- a/tools/qdoc3/generator.cpp
+++ b/tools/qdoc3/generator.cpp
@@ -814,10 +814,13 @@ QString Generator::imageFileName(const Node *relative, const QString& fileBase)
     if (filePath.isEmpty())
         return QString();
 
-    return QLatin1String("images/")
-           + Config::copyFile(relative->doc().location(),
-                              filePath, userFriendlyFilePath,
-                              outputDir() + QLatin1String("/images"));
+    QString path = Config::copyFile(relative->doc().location(),
+                                    filePath,
+                                    userFriendlyFilePath,
+                                    outputDir() + QLatin1String("/images"));
+    if (path[0] != '/')
+        return QLatin1String("images/") + path;
+    return QLatin1String("images") + path;
 }
 
 void Generator::setImageFileExtensions(const QStringList& extensions)