Merge remote branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	src/gui/kernel/qapplication.cpp
	tests/auto/qfileinfo/tst_qfileinfo.cpp
	tools/qdoc3/test/assistant.qdocconf
	tools/qdoc3/test/designer.qdocconf
	tools/qdoc3/test/linguist.qdocconf
	tools/qdoc3/test/qmake.qdocconf
	tools/qdoc3/test/qt-build-docs.qdocconf
	tools/qdoc3/test/qt.qdocconf

5 files changed, 6 insertions, 111 deletions

diff --git a/tools/assistant/lib/qhelpprojectdata.cpp b/tools/assistant/lib/qhelpprojectdata.cpp
index b0faf0c..5247847 100644
--- a/tools/assistant/lib/qhelpprojectdata.cpp
+++ b/tools/assistant/lib/qhelpprojectdata.cpp
@@ -327,10 +327,12 @@ bool QHelpProjectDataPrivate::hasValidSyntax(const QString &nameSpace,
     QUrl url;
     const QLatin1String scheme("qthelp");
     url.setScheme(scheme);
-    url.setHost(nameSpace);
+    const QString canonicalNamespace = nameSpace.toLower();
+    url.setHost(canonicalNamespace);
     url.setPath(vFolder);
 
-    const QString expectedUrl(scheme + QLatin1String("://") + nameSpace + slash + vFolder);
+    const QString expectedUrl(scheme + QLatin1String("://")
+        + canonicalNamespace + slash + vFolder);
     return url.isValid() && url.toString() == expectedUrl;
 }
 
diff --git a/tools/assistant/tools/assistant/assistant.pro b/tools/assistant/tools/assistant/assistant.pro
index 97d88dc..7f0fdd1 100644
--- a/tools/assistant/tools/assistant/assistant.pro
+++ b/tools/assistant/tools/assistant/assistant.pro
@@ -1,4 +1,4 @@
-include($$QT_SOURCE_TREE/tools/shared/fontpanel/fontpanel.pri)
+include(../../../shared/fontpanel/fontpanel.pri)
 TEMPLATE = app
 LANGUAGE = C++
 TARGET = assistant
diff --git a/tools/assistant/tools/assistant/helpviewer_qwv.cpp b/tools/assistant/tools/assistant/helpviewer_qwv.cpp
index 8993ac9..87973c0 100644
--- a/tools/assistant/tools/assistant/helpviewer_qwv.cpp
+++ b/tools/assistant/tools/assistant/helpviewer_qwv.cpp
@@ -107,7 +107,7 @@ qint64 HelpNetworkReply::readData(char *buffer, qint64 maxlen)
     TRACE_OBJ
     qint64 len = qMin(qint64(data.length()), maxlen);
     if (len) {
-        qMemCopy(buffer, data.constData(), len);
+        memcpy(buffer, data.constData(), len);
         data.remove(0, len);
     }
     if (!data.length())
diff --git a/tools/assistant/translations/qt_help.pro b/tools/assistant/translations/qt_help.pro
deleted file mode 100644
index 6f66876..0000000
--- a/tools/assistant/translations/qt_help.pro
+++ /dev/null
@@ -1,53 +0,0 @@
-# Include those manually as they do not contain any directory specification
-
-SOURCES += ../lib/qhelpcollectionhandler.cpp \
-           ../lib/qhelpcontentwidget.cpp \
-           ../lib/qhelpdatainterface.cpp \
-           ../lib/qhelpdbreader.cpp \
-           ../lib/qhelpengine.cpp \
-           ../lib/qhelpenginecore.cpp \
-           ../lib/qhelpgenerator.cpp \
-           ../lib/qhelpindexwidget.cpp \
-           ../lib/qhelpprojectdata.cpp \
-           ../lib/qhelpsearchengine.cpp \
-           ../lib/qhelpsearchindexreader_clucene.cpp \
-           ../lib/qhelpsearchindexreader_default.cpp \
-           ../lib/qhelpsearchindexwriter_clucene.cpp \
-           ../lib/qhelpsearchindexwriter_default.cpp \
-           ../lib/qhelpsearchindex_default.cpp \
-           ../lib/qhelpsearchquerywidget.cpp \
-           ../lib/qhelpsearchresultwidget.cpp
-
-HEADERS += ../lib/qhelpcollectionhandler_p.h \
-           ../lib/qhelpcontentwidget.h \
-           ../lib/qhelpdatainterface_p.h \
-           ../lib/qhelpdbreader_p.h \
-           ../lib/qhelpengine.h \
-           ../lib/qhelpenginecore.h \
-           ../lib/qhelpengine_p.h \
-           ../lib/qhelpgenerator_p.h \
-           ../lib/qhelpindexwidget.h \
-           ../lib/qhelpprojectdata_p.h \
-           ../lib/qhelpsearchengine.h \
-           ../lib/qhelpsearchindexreader_clucene_p.h \
-           ../lib/qhelpsearchindexreader_default_p.h \
-           ../lib/qhelpsearchindexwriter_clucene_p.h \
-           ../lib/qhelpsearchindexwriter_default_p.h \
-           ../lib/qhelpsearchindex_default_p.h \
-           ../lib/qhelpsearchquerywidget.h \
-           ../lib/qhelpsearchresultwidget.h \
-           ../lib/qhelp_global.h
-
-
-TR_DIR = $$PWD/../../../translations
-TRANSLATIONS = \
-    $$TR_DIR/qt_help_cs.ts \
-    $$TR_DIR/qt_help_da.ts \
-    $$TR_DIR/qt_help_de.ts \
-    $$TR_DIR/qt_help_hu.ts \
-    $$TR_DIR/qt_help_ja.ts \
-    $$TR_DIR/qt_help_pl.ts \
-    $$TR_DIR/qt_help_ru.ts \
-    $$TR_DIR/qt_help_zh_CN.ts \
-    $$TR_DIR/qt_help_zh_TW.ts \
-    $$TR_DIR/qt_help_fr.ts
diff --git a/tools/assistant/translations/translations.pro b/tools/assistant/translations/translations.pro
deleted file mode 100644
index c692262..0000000
--- a/tools/assistant/translations/translations.pro
+++ /dev/null
@@ -1,54 +0,0 @@
-# Include those manually as they do not contain any directory specification
-
-FORMS += ../tools/assistant/filternamedialog.ui \
-         ../tools/assistant/installdialog.ui \
-         ../tools/assistant/preferencesdialog.ui \
-         ../tools/assistant/topicchooser.ui \
-         ../tools/assistant/bookmarkdialog.ui
-
-SOURCES += ../tools/assistant/aboutdialog.cpp \
-           ../tools/assistant/bookmarkmanager.cpp \
-           ../tools/assistant/centralwidget.cpp \
-           ../tools/assistant/cmdlineparser.cpp \
-           ../tools/assistant/contentwindow.cpp \
-           ../tools/assistant/filternamedialog.cpp \
-           ../tools/assistant/helpviewer.cpp \
-           ../tools/assistant/indexwindow.cpp \
-           ../tools/assistant/installdialog.cpp \
-           ../tools/assistant/main.cpp \
-           ../tools/assistant/mainwindow.cpp \
-           ../tools/assistant/preferencesdialog.cpp \
-           ../tools/assistant/remotecontrol.cpp \
-           ../tools/assistant/searchwidget.cpp \
-           ../tools/assistant/topicchooser.cpp \
-
-SOURCES += ../../shared/fontpanel/fontpanel.cpp
-
-HEADERS += ../tools/assistant/aboutdialog.h \
-           ../tools/assistant/bookmarkmanager.h \
-           ../tools/assistant/centralwidget.h \
-           ../tools/assistant/cmdlineparser.h \
-           ../tools/assistant/contentwindow.h \
-           ../tools/assistant/filternamedialog.h \
-           ../tools/assistant/helpviewer.h \
-           ../tools/assistant/indexwindow.h \
-           ../tools/assistant/installdialog.h \
-           ../tools/assistant/mainwindow.h \
-           ../tools/assistant/preferencesdialog.h \
-           ../tools/assistant/remotecontrol.h \
-           ../tools/assistant/remotecontrol_win.h \
-           ../tools/assistant/searchwidget.h \
-           ../tools/assistant/topicchooser.h \
-
-TR_DIR = $$PWD/../../../translations
-TRANSLATIONS = \
-    $$TR_DIR/assistant_cs.ts \
-    $$TR_DIR/assistant_da.ts \
-    $$TR_DIR/assistant_de.ts \
-    $$TR_DIR/assistant_fr.ts \
-    $$TR_DIR/assistant_hu.ts \
-    $$TR_DIR/assistant_ja.ts \
-    $$TR_DIR/assistant_pl.ts \
-    $$TR_DIR/assistant_ru.ts \
-    $$TR_DIR/assistant_zh_CN.ts \
-    $$TR_DIR/assistant_zh_TW.ts