Merge remote-tracking branch 'origin/2.0'

Conflicts:
	dist/config/config.xml
	dist/packages/org.qtproject.ifw.binaries/meta/package.xml
	dist/packages/org.qtproject.ifw/meta/package.xml
	installerfw.pri

Change-Id: I60673fac543f1153dad3ef01e589c1f9c6d64599

4 files changed, 19 insertions, 6 deletions

diff --git a/INSTALL b/INSTALL
index ed72a245e..66ff4682f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -16,7 +16,10 @@ Build a static Qt
 ---------------------
 
 Building the Qt Installer Framework from sources requires Qt (version 5.4.0
-or newer). If you want to ship your installer as a single file you have to build
+or newer). Supported compilers are MSVC 2013 or newer, GCC 4.7 or newer,
+and Clang 3.1 or newer.
+
+If you want to ship your installer as a single file you have to build
 Qt and the Qt Installer Framework statically.
 
 See the Qt documentation for the prerequisites and steps to build Qt from sources.
@@ -51,7 +54,7 @@ configure -prefix %CD%\qtbase -release -static -target xp -accessibility -no-ope
 
 Recommended configuration options for Linux:
 
-configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -qt-xcb -qt-pcre -qt-freetype -no-glib -no-cups -no-sql-sqlite -no-qml-debug -no-opengl -no-egl -no-xinput -no-xinput2 -no-sm -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns
+configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -qt-xcb -qt-pcre -qt-freetype -no-glib -no-cups -no-sql-sqlite -no-qml-debug -no-opengl -no-egl -no-xinput -no-xinput2 -no-sm -no-icu -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns
 
 ### OS X
 
diff --git a/doc/installerfw-getting-started.qdoc b/doc/installerfw-getting-started.qdoc
index ba1ec08a2..044fd2ed3 100644
--- a/doc/installerfw-getting-started.qdoc
+++ b/doc/installerfw-getting-started.qdoc
@@ -46,8 +46,8 @@
 
     \list
         \li Microsoft Windows XP, and later
-        \li Ubuntu Linux 8.04, and later
-        \li OS X 10.6, and later
+        \li Ubuntu Linux 11.10, and later
+        \li OS X 10.7, and later
     \endlist
 
     \section1 Building from Sources
@@ -56,12 +56,19 @@
     yourself. You can skip this if you have downloaded a pre-built version
     of the framework.
 
+    \section2 Supported Compilers
+
+    The Qt Installer Framework can be compiled with Microsoft Visual Studio
+    2013 and newer, GCC 4.7 and newer, and Clang 3.1 and newer.
+
     \section2 Configuring Qt
 
     If you use a statically built Qt to build the Qt Installer Framework
     you do not have to deliver Qt libraries, which enables you to distribute
     installers as one file.
 
+    The minimum required Qt version is 5.4.0.
+
     \section3 Configuring Qt for Windows
 
     Before running configure you should tweak Qt to statically link in the C
@@ -91,7 +98,7 @@
     We recommend that you use the following configuration options for Linux:
 
     \code
-    configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -qt-xcb -qt-pcre -qt-freetype -no-glib -no-cups -no-sql-sqlite -no-qml-debug -no-opengl -no-egl -no-xinput -no-xinput2 -no-sm -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns
+    configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -qt-xcb -qt-pcre -qt-freetype -no-glib -no-cups -no-sql-sqlite -no-qml-debug -no-opengl -no-egl -no-xinput -no-xinput2 -no-sm -no-icu -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns
     \endcode
 
     \section3 Configuring Qt for OS X
diff --git a/src/libs/installer/proxycredentialsdialog.cpp b/src/libs/installer/proxycredentialsdialog.cpp
index ce8c9a88b..559f9d3bb 100644
--- a/src/libs/installer/proxycredentialsdialog.cpp
+++ b/src/libs/installer/proxycredentialsdialog.cpp
@@ -42,6 +42,9 @@ ProxyCredentialsDialog::ProxyCredentialsDialog(const QNetworkProxy &proxy, QWidg
     QDialog(parent),
     ui(new Ui::ProxyCredentialsDialog)
 {
+    setWindowTitle(tr("Proxy Credentials"));
+    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+
     ui->setupUi(this);
 
     setUserName(proxy.user());
diff --git a/tools/build_installer.py b/tools/build_installer.py
index e97d5df70..e34c34032 100755
--- a/tools/build_installer.py
+++ b/tools/build_installer.py
@@ -44,7 +44,7 @@ def init():
     basename = os.path.basename(src_dir)
     build_dir = os.path.join(root_dir, basename + '_build')
     package_dir = os.path.join(root_dir, basename + '_pkg')
-    target_path = os.path.join(args.target_dir, 'ifw')
+    target_path = os.path.join(args.target_dir, 'Qt Installer Framework')
 
     print 'source dir: ' + src_dir
     print 'build dir: ' + build_dir