Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt

Conflicts:
	configure.exe
	examples/itemviews/puzzle/puzzle.pro
	examples/qtconcurrent/imagescaling/imagescaling.pro
	examples/widgets/movie/movie.pro
	tools/configure/configureapp.cpp

Will rebuild configure.exe in next commit.

10 files changed, 170 insertions, 122 deletions

diff --git a/tools/assistant/lib/fulltextsearch/qclucene_global_p.h b/tools/assistant/lib/fulltextsearch/qclucene_global_p.h
index 2a9d146..3dba45a 100644
--- a/tools/assistant/lib/fulltextsearch/qclucene_global_p.h
+++ b/tools/assistant/lib/fulltextsearch/qclucene_global_p.h
@@ -29,6 +29,14 @@
 #include <QtCore/QChar>
 #include <QtCore/QString>
 
+#if !defined(_MSC_VER) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T)
+#   if !defined(TCHAR)
+#       define TCHAR wchar_t
+#   endif
+#else
+#   include <windows.h>
+#endif
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -87,14 +95,6 @@ QT_BEGIN_NAMESPACE
 #   define CL_NS2(sub,sub2)
 #endif
 
-#if !defined(_MSC_VER) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T)
-#   if !defined(TCHAR)
-#       define TCHAR wchar_t
-#   endif
-#else
-#   include <windows.h>
-#endif
-
 namespace {
     TCHAR* QStringToTChar(const QString &str)
     {
diff --git a/tools/assistant/tools/assistant/centralwidget.cpp b/tools/assistant/tools/assistant/centralwidget.cpp
index b78f346..52d48d5 100644
--- a/tools/assistant/tools/assistant/centralwidget.cpp
+++ b/tools/assistant/tools/assistant/centralwidget.cpp
@@ -87,6 +87,7 @@ namespace {
 
 FindWidget::FindWidget(QWidget *parent)
     : QWidget(parent)
+    , appPalette(qApp->palette())
 {
     QHBoxLayout *hboxLayout = new QHBoxLayout(this);
     QString resourcePath = QLatin1String(":/trolltech/assistant/images/");
@@ -148,6 +149,34 @@ FindWidget::~FindWidget()
 {
 }
 
+void FindWidget::hideEvent(QHideEvent* event)
+{
+#if !defined(QT_NO_WEBKIT)
+    // TODO: remove this once webkit supports setting the palette
+    if (!event->spontaneous())
+        qApp->setPalette(appPalette);
+#else
+    Q_UNUSED(event);
+#endif
+}
+
+void FindWidget::showEvent(QShowEvent* event)
+{
+#if !defined(QT_NO_WEBKIT)
+    // TODO: remove this once webkit supports setting the palette
+    if (!event->spontaneous()) {
+        QPalette p = appPalette;
+        p.setColor(QPalette::Inactive, QPalette::Highlight,
+            p.color(QPalette::Active, QPalette::Highlight));
+        p.setColor(QPalette::Inactive, QPalette::HighlightedText,
+            p.color(QPalette::Active, QPalette::HighlightedText));
+        qApp->setPalette(p);
+    }
+#else
+    Q_UNUSED(event);
+#endif
+}
+
 void FindWidget::updateButtons()
 {
     if (editFind->text().isEmpty()) {
@@ -245,12 +274,14 @@ CentralWidget::CentralWidget(QHelpEngine *engine, MainWindow *parent)
             SLOT(showTabBarContextMenu(QPoint)));
     }
 
-    QPalette p = qApp->palette();
+#if defined(QT_NO_WEBKIT)
+    QPalette p = palette();
     p.setColor(QPalette::Inactive, QPalette::Highlight,
         p.color(QPalette::Active, QPalette::Highlight));
     p.setColor(QPalette::Inactive, QPalette::HighlightedText,
         p.color(QPalette::Active, QPalette::HighlightedText));
-    qApp->setPalette(p);
+    setPalette(p);
+#endif
 }
 
 CentralWidget::~CentralWidget()
@@ -848,60 +879,64 @@ void CentralWidget::keyPressEvent(QKeyEvent *e)
     QWidget::keyPressEvent(e);
 }
 
-void CentralWidget::find(QString ttf, bool forward, bool backward)
+void CentralWidget::find(const QString &ttf, bool forward, bool backward)
 {
-    QTextCursor cursor;
-    QTextDocument *doc = 0;
-    QTextBrowser *browser = 0;
-
-    HelpViewer *viewer = currentHelpViewer();
     QPalette p = findWidget->editFind->palette();
     p.setColor(QPalette::Active, QPalette::Base, Qt::white);
 
-#if !defined(QT_NO_WEBKIT)
-    Q_UNUSED(forward)
-    Q_UNUSED(doc)
-    Q_UNUSED(browser)
-
-    if (viewer) {
-        QWebPage::FindFlags options;
-        if (backward)
-            options |= QWebPage::FindBackward;
+    if (!ttf.isEmpty()) {
+        HelpViewer *viewer = currentHelpViewer();
 
-        if (findWidget->checkCase->isChecked())
-            options |= QWebPage::FindCaseSensitively;
+        bool found = false;
+#if !defined(QT_NO_WEBKIT)
+        if (viewer) {
+            QWebPage::FindFlags options;
+            if (backward)
+                options |= QWebPage::FindBackward;
 
-        bool found = viewer->findText(ttf, options);
-        findWidget->labelWrapped->hide();
+            if (findWidget->checkCase->isChecked())
+                options |= QWebPage::FindCaseSensitively;
 
-        if (!found) {
-            options |= QWebPage::FindWrapsAroundDocument;
             found = viewer->findText(ttf, options);
+            findWidget->labelWrapped->hide();
 
             if (!found) {
-                p.setColor(QPalette::Active, QPalette::Base, QColor(255, 102, 102));
-            } else {
-                findWidget->labelWrapped->show();
+                options |= QWebPage::FindWrapsAroundDocument;
+                found = viewer->findText(ttf, options);
+                if (found)
+                    findWidget->labelWrapped->show();
             }
+        } else if (tabWidget->currentWidget() == m_searchWidget) {
+            QTextBrowser *browser = qFindChild<QTextBrowser*>(m_searchWidget);
+            found = findInTextBrowser(browser, ttf, forward, backward);
         }
-    }
 #else
-    if (viewer) {
-        doc = viewer->document();
-        cursor = viewer->textCursor();
-        browser = qobject_cast<QTextBrowser*>(viewer);
-    }
+        QTextBrowser *browser = qobject_cast<QTextBrowser*>(viewer);
+        if (tabWidget->currentWidget() == m_searchWidget)
+            browser = qFindChild<QTextBrowser*>(m_searchWidget);
+        found = findInTextBrowser(browser, ttf, forward, backward);
+#endif
 
-    if (tabWidget->currentWidget() == m_searchWidget) {
-        QTextBrowser *browser = qFindChild<QTextBrowser*>(m_searchWidget);
-        if (browser) {
-            doc = browser->document();
-            cursor = browser->textCursor();
-        }
+        if (!found)
+            p.setColor(QPalette::Active, QPalette::Base, QColor(255, 102, 102));
     }
 
-    if (!browser || !doc || cursor.isNull())
-        return;
+    if (!findWidget->isVisible())
+        findWidget->show();
+    findWidget->editFind->setPalette(p);
+}
+
+bool CentralWidget::findInTextBrowser(QTextBrowser* browser, const QString &ttf,
+    bool forward, bool backward)
+{
+    if (!browser)
+        return false;
+
+    QTextDocument *doc = browser->document();
+    QTextCursor cursor = browser->textCursor();
+
+    if (!doc || cursor.isNull())
+        return false;
 
     QTextDocument::FindFlags options;
 
@@ -910,44 +945,33 @@ void CentralWidget::find(QString ttf, bool forward, bool backward)
             QTextCursor::MoveAnchor);
     }
 
-    QTextCursor newCursor = cursor;
+    if (backward)
+        options |= QTextDocument::FindBackward;
 
-    if (!ttf.isEmpty()) {
-        if (backward)
-            options |= QTextDocument::FindBackward;
-
-        if (findWidget->checkCase->isChecked())
-            options |= QTextDocument::FindCaseSensitively;
+    if (findWidget->checkCase->isChecked())
+        options |= QTextDocument::FindCaseSensitively;
 
-        if (findWidget->checkWholeWords->isChecked())
-            options |= QTextDocument::FindWholeWords;
+    if (findWidget->checkWholeWords->isChecked())
+        options |= QTextDocument::FindWholeWords;
 
-        newCursor = doc->find(ttf, cursor, options);
-        findWidget->labelWrapped->hide();
+    findWidget->labelWrapped->hide();
 
+    bool found = true;
+    QTextCursor newCursor = doc->find(ttf, cursor, options);
+    if (newCursor.isNull()) {
+        QTextCursor ac(doc);
+        ac.movePosition(options & QTextDocument::FindBackward
+            ? QTextCursor::End : QTextCursor::Start);
+        newCursor = doc->find(ttf, ac, options);
         if (newCursor.isNull()) {
-            QTextCursor ac(doc);
-            ac.movePosition(options & QTextDocument::FindBackward
-                    ? QTextCursor::End : QTextCursor::Start);
-            newCursor = doc->find(ttf, ac, options);
-            if (newCursor.isNull()) {
-                p.setColor(QPalette::Active, QPalette::Base, QColor(255, 102, 102));
-                newCursor = cursor;
-            } else {
-                findWidget->labelWrapped->show();
-            }
+            found = false;
+            newCursor = cursor;
+        } else {
+            findWidget->labelWrapped->show();
         }
     }
-#endif
-
-    if (!findWidget->isVisible())
-        findWidget->show();
-
-#if defined(QT_NO_WEBKIT)
-    if (browser)
-        browser->setTextCursor(newCursor);
-#endif
-    findWidget->editFind->setPalette(p);
+    browser->setTextCursor(newCursor);
+    return found;
 }
 
 void CentralWidget::updateBrowserFont()
diff --git a/tools/assistant/tools/assistant/centralwidget.h b/tools/assistant/tools/assistant/centralwidget.h
index e3ce200..d59dbe5 100644
--- a/tools/assistant/tools/assistant/centralwidget.h
+++ b/tools/assistant/tools/assistant/centralwidget.h
@@ -55,6 +55,7 @@ class QLabel;
 class QAction;
 class QCheckBox;
 class QLineEdit;
+class QTextBrowser;
 class QToolButton;
 
 class HelpViewer;
@@ -79,6 +80,10 @@ signals:
     void findNext();
     void findPrevious();
 
+protected:
+    void hideEvent(QHideEvent* event);
+    void showEvent(QShowEvent * event);
+
 private slots:
     void updateButtons();
 
@@ -94,6 +99,7 @@ private:
     QToolButton *toolPrevious;
     QCheckBox *checkWholeWords;
 
+    QPalette appPalette;
     friend class CentralWidget;
 };
 
@@ -176,7 +182,9 @@ private slots:
 private:
     void connectSignals();
     bool eventFilter(QObject *object, QEvent *e);
-    void find(QString ttf, bool forward, bool backward);
+    void find(const QString &ttf, bool forward, bool backward);
+    bool findInTextBrowser(QTextBrowser* browser, const QString &ttf,
+        bool forward, bool backward);
     void initPrinter();
     QString quoteTabTitle(const QString &title) const;
     void highlightSearchTerms();
diff --git a/tools/assistant/translations/qt_help.pro b/tools/assistant/translations/qt_help.pro
index efad6bf..e6208a6 100644
--- a/tools/assistant/translations/qt_help.pro
+++ b/tools/assistant/translations/qt_help.pro
@@ -44,5 +44,6 @@ TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/qt_help_de.ts \
              $$[QT_INSTALL_TRANSLATIONS]/qt_help_pl.ts \
              $$[QT_INSTALL_TRANSLATIONS]/qt_help_untranslated.ts \
              $$[QT_INSTALL_TRANSLATIONS]/qt_help_zh_CN.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/qt_help_zh_TW.ts
+             $$[QT_INSTALL_TRANSLATIONS]/qt_help_zh_TW.ts \
+             $$[QT_INSTALL_TRANSLATIONS]/qt_help_da.ts
 error("This is a dummy profile to be used for translations ONLY.")
diff --git a/tools/assistant/translations/translations.pro b/tools/assistant/translations/translations.pro
index 58de554..8572123 100644
--- a/tools/assistant/translations/translations.pro
+++ b/tools/assistant/translations/translations.pro
@@ -45,4 +45,5 @@ TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/assistant_de.ts \
              $$[QT_INSTALL_TRANSLATIONS]/assistant_pl.ts \
              $$[QT_INSTALL_TRANSLATIONS]/assistant_untranslated.ts \
              $$[QT_INSTALL_TRANSLATIONS]/assistant_zh_CN.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/assistant_zh_TW.ts
+             $$[QT_INSTALL_TRANSLATIONS]/assistant_zh_TW.ts \
+             $$[QT_INSTALL_TRANSLATIONS]/assistant_da.ts
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 9b44fb5..b4a14f2 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -1381,6 +1381,7 @@ void Configure::applySpecSpecifics()
         dictionary[ "WEBKIT" ]              = "no";
         dictionary[ "PHONON" ]              = "yes";
         dictionary[ "DIRECTSHOW" ]          = "no";
+        dictionary[ "LTCG" ]                = "yes";
         // We only apply MMX/IWMMXT for mkspecs we know they work
         if (dictionary[ "XQMAKESPEC" ].startsWith("wincewm")) {
             dictionary[ "MMX" ]    = "yes";
@@ -3644,12 +3645,15 @@ void Configure::readLicense()
         dictionary["PLATFORM NAME"] = "Qt for S60";
     else
         dictionary["PLATFORM NAME"] = "Qt for Windows";
+    dictionary["LICENSE FILE"] = sourcePath;
+
     bool openSource = false;
+    bool hasOpenSource = QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.GPL3") || QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.LGPL");
     if (dictionary["BUILDNOKIA"] == "yes" || dictionary["BUILDTYPE"] == "commercial") {
         openSource = false;
     } else if (dictionary["BUILDTYPE"] == "opensource") {
         openSource = true;
-    } else {
+    } else if (hasOpenSource) { // No Open Source? Just display the commercial license right away
         forever {
             char accept = '?';
             cout << "Which edition of Qt do you want to use ?" << endl;
@@ -3667,28 +3671,23 @@ void Configure::readLicense()
             }
         }
     }
-    if (openSource) {
-        dictionary["LICENSE FILE"] = sourcePath;
-        if (QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.GPL3") || QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.LGPL")) {
-            cout << endl << "This is the " << dictionary["PLATFORM NAME"] << " Open Source Edition." << endl;
-            licenseInfo["LICENSEE"] = "Open Source";
-            dictionary["EDITION"] = "OpenSource";
-            dictionary["QT_EDITION"] = "QT_EDITION_OPENSOURCE";
-            cout << endl;
-            if (!showLicense(dictionary["LICENSE FILE"])) {
-                cout << "Configuration aborted since license was not accepted";
-                dictionary["DONE"] = "error";
-                return;
-            }
+    if (hasOpenSource && openSource) {
+        cout << endl << "This is the " << dictionary["PLATFORM NAME"] << " Open Source Edition." << endl;
+        licenseInfo["LICENSEE"] = "Open Source";
+        dictionary["EDITION"] = "OpenSource";
+        dictionary["QT_EDITION"] = "QT_EDITION_OPENSOURCE";
+        cout << endl;
+        if (!showLicense(dictionary["LICENSE FILE"])) {
+            cout << "Configuration aborted since license was not accepted";
+            dictionary["DONE"] = "error";
             return;
         }
-#ifndef COMMERCIAL_VERSION
-    else {
-        cout << endl << "Cannot find the GPL license files!" << endl;
+    } else if (openSource) {
+        cout << endl << "Cannot find the GPL license files! Please download the Open Source version of the library." << endl;
         dictionary["DONE"] = "error";
     }
-#else
-    } else {
+#ifdef COMMERCIAL_VERSION
+    else {
         Tools::checkLicense(dictionary, licenseInfo, firstLicensePath());
         if (dictionary["DONE"] != "error" && dictionary["BUILDNOKIA"] != "yes") {
             // give the user some feedback, and prompt for license acceptance
@@ -3700,7 +3699,12 @@ void Configure::readLicense()
             }
         }
     }
-#endif // COMMERCIAL_VERSION
+#else // !COMMERCIAL_VERSION
+    else {
+        cout << endl << "Cannot build commercial edition from the open source version of the library." << endl;
+        dictionary["DONE"] = "error";
+    }
+#endif
 }
 
 void Configure::reloadCmdLine()
diff --git a/tools/designer/src/components/formeditor/qdesigner_resource.cpp b/tools/designer/src/components/formeditor/qdesigner_resource.cpp
index 75a53b7..064da9b 100644
--- a/tools/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/tools/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -159,6 +159,7 @@ private:
     QDesignerFormEditorInterface *m_core;
     DesignerPixmapCache  *m_pixmapCache;
     DesignerIconCache    *m_iconCache;
+    const QDesignerLanguageExtension *m_lang;
     bool                  m_saveRelative;
     mutable QMap<QString, bool>   m_usedQrcFiles;
     mutable QMap<QString, bool>   m_loadedQrcFiles;
@@ -168,13 +169,18 @@ QDesignerResourceBuilder::QDesignerResourceBuilder(QDesignerFormEditorInterface
     m_core(core),
     m_pixmapCache(pixmapCache),
     m_iconCache(iconCache),
+    m_lang(qt_extension<QDesignerLanguageExtension *>(core->extensionManager(), core)),
     m_saveRelative(true)
 {
 }
 
-static inline void setIconPixmap(QIcon::Mode m, QIcon::State s, const QDir &workingDirectory, const QString &v, PropertySheetIconValue &icon)
+static inline void setIconPixmap(QIcon::Mode m, QIcon::State s, const QDir &workingDirectory, 
+                                 QString path, PropertySheetIconValue &icon,
+                                 const QDesignerLanguageExtension *lang = 0)
 {
-    icon.setPixmap(m, s, PropertySheetPixmapValue(QFileInfo(workingDirectory, v).absoluteFilePath()));
+    if (lang == 0 || !lang->isLanguageResource(path))
+        path = QFileInfo(workingDirectory, path).absoluteFilePath();
+    icon.setPixmap(m, s, PropertySheetPixmapValue(path));
 }
 
 QVariant QDesignerResourceBuilder::loadResource(const QDir &workingDirectory, const DomProperty *property) const
@@ -184,7 +190,11 @@ QVariant QDesignerResourceBuilder::loadResource(const QDir &workingDirectory, co
             PropertySheetPixmapValue pixmap;
             DomResourcePixmap *dp = property->elementPixmap();
             if (!dp->text().isEmpty()) {
-                pixmap.setPath(QFileInfo(workingDirectory, dp->text()).absoluteFilePath());
+                if (m_lang != 0 && m_lang->isLanguageResource(dp->text())) {
+                    pixmap.setPath(dp->text());
+                } else {
+                    pixmap.setPath(QFileInfo(workingDirectory, dp->text()).absoluteFilePath());
+                }
 #ifdef OLD_RESOURCE_FORMAT
                 if (dp->hasAttributeResource())
                     m_loadedQrcFiles.insert(QFileInfo(workingDirectory, dp->attributeResource()).absoluteFilePath(), false);
@@ -198,24 +208,24 @@ QVariant QDesignerResourceBuilder::loadResource(const QDir &workingDirectory, co
             DomResourceIcon *di = property->elementIconSet();
             if (const int flags = iconStateFlags(di)) { // new, post 4.4 format
                 if (flags & NormalOff)
-                    setIconPixmap(QIcon::Normal, QIcon::Off, workingDirectory, di->elementNormalOff()->text(), icon);
+                    setIconPixmap(QIcon::Normal, QIcon::Off, workingDirectory, di->elementNormalOff()->text(), icon, m_lang);
                 if (flags & NormalOn)
-                    setIconPixmap(QIcon::Normal, QIcon::On, workingDirectory, di->elementNormalOn()->text(), icon);
+                    setIconPixmap(QIcon::Normal, QIcon::On, workingDirectory, di->elementNormalOn()->text(), icon, m_lang);
                 if (flags & DisabledOff)
-                    setIconPixmap(QIcon::Disabled, QIcon::Off, workingDirectory, di->elementDisabledOff()->text(), icon);
+                    setIconPixmap(QIcon::Disabled, QIcon::Off, workingDirectory, di->elementDisabledOff()->text(), icon, m_lang);
                 if (flags & DisabledOn)
-                    setIconPixmap(QIcon::Disabled, QIcon::On, workingDirectory, di->elementDisabledOn()->text(), icon);
+                    setIconPixmap(QIcon::Disabled, QIcon::On, workingDirectory, di->elementDisabledOn()->text(), icon, m_lang);
                 if (flags & ActiveOff)
-                    setIconPixmap(QIcon::Active, QIcon::Off, workingDirectory, di->elementActiveOff()->text(), icon);
+                    setIconPixmap(QIcon::Active, QIcon::Off, workingDirectory, di->elementActiveOff()->text(), icon, m_lang);
                 if (flags & ActiveOn)
-                    setIconPixmap(QIcon::Active, QIcon::On, workingDirectory, di->elementActiveOn()->text(), icon);
+                    setIconPixmap(QIcon::Active, QIcon::On, workingDirectory, di->elementActiveOn()->text(), icon, m_lang);
                 if (flags & SelectedOff)
-                    setIconPixmap(QIcon::Selected, QIcon::Off, workingDirectory, di->elementSelectedOff()->text(), icon);
+                    setIconPixmap(QIcon::Selected, QIcon::Off, workingDirectory, di->elementSelectedOff()->text(), icon, m_lang);
                 if (flags & SelectedOn)
-                    setIconPixmap(QIcon::Selected, QIcon::On, workingDirectory, di->elementSelectedOn()->text(), icon);
+                    setIconPixmap(QIcon::Selected, QIcon::On, workingDirectory, di->elementSelectedOn()->text(), icon, m_lang);
             } else {
 #ifdef OLD_RESOURCE_FORMAT
-                setIconPixmap(QIcon::Normal, QIcon::Off, workingDirectory, di->text(), icon);
+                setIconPixmap(QIcon::Normal, QIcon::Off, workingDirectory, di->text(), icon, m_lang);
                 if (di->hasAttributeResource())
                     m_loadedQrcFiles.insert(QFileInfo(workingDirectory, di->attributeResource()).absoluteFilePath(), false);
 #endif
diff --git a/tools/qdoc3/doc.cpp b/tools/qdoc3/doc.cpp
index 61d0ed6..397fbfa 100644
--- a/tools/qdoc3/doc.cpp
+++ b/tools/qdoc3/doc.cpp
@@ -1265,9 +1265,7 @@ void DocParser::parse(const QString& source,
                         }
                         else {
                             append(Atom::ParaLeft);
-                            append(Atom::String,
-                                   "This is an overloaded member function, "
-                                   "provided for convenience.");
+                            append(Atom::String,"This is an overloaded function.");
                             append(Atom::ParaRight);
                             x = getMetaCommandArgument(cmdStr);
                         }
diff --git a/tools/qdoc3/main.cpp b/tools/qdoc3/main.cpp
index 3e6f832..5c247fa 100644
--- a/tools/qdoc3/main.cpp
+++ b/tools/qdoc3/main.cpp
@@ -43,6 +43,7 @@
   main.cpp
 */
 
+#include <qglobal.h>
 #include <QtCore>
 #include <stdlib.h>
 #include "apigenerator.h"
@@ -136,7 +137,8 @@ static void printHelp()
  */
 static void printVersion()
 {
-    Location::information(tr("qdoc version 4.4.1"));
+    QString s = QString(tr("qdoc version ")) + QString(QT_VERSION_STR);
+    Location::information(s);
 }
 
 /*!
diff --git a/tools/qdoc3/test/classic.css b/tools/qdoc3/test/classic.css
index 6cf7377..f22a77a 100644
--- a/tools/qdoc3/test/classic.css
+++ b/tools/qdoc3/test/classic.css
@@ -77,10 +77,10 @@ table.annotated td {
 
 table tr pre
 {
-  padding-top: none;
-  padding-bottom: none;
-  padding-left: none;
-  padding-right: none;
+  padding-top: 0px;
+  padding-bottom: 0px;
+  padding-left: 0px;
+  padding-right: 0px;
   border: none;
   background: none
 }