From 39c2dadb47ab8fbe842fd968b5e86bd93e2d0110 Mon Sep 17 00:00:00 2001
From: Katja Marttila <katja.marttila@theqtcompany.com>
Date: Tue, 22 Mar 2016 09:19:26 +0200
Subject: [PATCH] Update minimum Qt version for 2.0.3 release
Minimum required version is now Qt5.5
Change-Id: If000a507f0067650605987d38374bf6694eb16aa
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
---
INSTALL | 31 ++++-----------------------
doc/installerfw-getting-started.qdoc | 23 ++++----------------
tools/binarycreator/binarycreator.pro | 2 --
3 files changed, 8 insertions(+), 48 deletions(-)
diff --git a/INSTALL b/INSTALL
index bef28a32..e99fcf74 100644
--- a/INSTALL
+++ b/INSTALL
@@ -15,7 +15,7 @@ http://code.qt.io/cgit/installer-framework/installer-framework.git/
Build a static Qt
---------------------
-Building the Qt Installer Framework from sources requires Qt (version 5.4.0
+Building the Qt Installer Framework from sources requires Qt (version 5.5
or newer). Supported compilers are MSVC 2013 or newer, GCC 4.7 or newer,
and Clang 3.1 or newer.
@@ -26,44 +26,21 @@ See the Qt documentation for the prerequisites and steps to build Qt from source
### Windows
-For Qt 5.4, you need to adjust the respective qmake.conf to have a real stand alone
-working installer. Replace -MD, -MDd with -MT, -MTD in the CFLAGS lines.
-
-'git diff' should show you something like:
-
---- a/mkspecs/win32-msvc2013/qmake.conf
-+++ b/mkspecs/win32-msvc2013/qmake.conf
- QMAKE_CFLAGS = -nologo -Zm200 -Zc:wchar_t -FS
- QMAKE_CFLAGS_WARN_ON = -W3
- QMAKE_CFLAGS_WARN_OFF = -W0
--QMAKE_CFLAGS_RELEASE = -O2 -MD -Zc:strictStrings
--QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MD -Zi -Zc:strictStrings
--QMAKE_CFLAGS_DEBUG = -Zi -MDd
-+QMAKE_CFLAGS_RELEASE = -O2 -MT -Zc:strictStrings
-+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MT -Zi -Zc:strictStrings
-+QMAKE_CFLAGS_DEBUG = -Zi -MTd
- QMAKE_CFLAGS_YACC =
- QMAKE_CFLAGS_LTCG = -GL
- QMAKE_CFLAGS_MP = -MP
-
-From Qt 5.5 onwards, you can achieve the same by passing -static-runtime to
-configure.
-
Recommended configuration options for Microsoft Windows:
-configure -prefix %CD%\qtbase -release -static -target xp -accessibility -no-opengl -no-icu -no-sql-sqlite -no-qml-debug -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 %CD%\qtbase -release -static -static-runtime -target xp -accessibility -no-opengl -no-icu -no-sql-sqlite -no-qml-debug -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 -skip qt3d
### Linux
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 -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
+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 -skip qt3d
### OS X
Recommended configuration options for OS X:
-configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-sql-sqlite -no-qml-debug -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 -no-cups -no-sql-sqlite -no-qml-debug -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 -skip qt3d
Build the Framework
diff --git a/doc/installerfw-getting-started.qdoc b/doc/installerfw-getting-started.qdoc
index c18ccec4..9db26a99 100644
--- a/doc/installerfw-getting-started.qdoc
+++ b/doc/installerfw-getting-started.qdoc
@@ -67,30 +67,15 @@
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.
+ The minimum required Qt version is 5.5.
\section3 Configuring Qt for Windows
- Usually, you want to tweak Qt to statically link in the C
- runtime library. This can be done by changing the default mkspec of
- your compiler (Qt 5.4) or by passing \c{-static-runtime} to configure (Qt 5.5
- and newer).
-
- For Qt 5.4, you need to edit
- \c{mkspecs\win32-msvc2013\qmake.conf} and replace in the CFLAGS sections
- '-MD' with '-MT':
-
- \code
- QMAKE_CFLAGS_RELEASE = -O2 -MT -Zc:strictStrings
- QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MT -Zi -Zc:strictStrings
- QMAKE_CFLAGS_DEBUG = -Zi -MTd
- \endcode
-
We recommend that you use the following options when you configure Qt for
Windows:
\code
- configure -prefix %CD%\qtbase -release -static -target xp -accessibility -no-opengl -no-icu -no-sql-sqlite -no-qml-debug -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 %CD%\qtbase -release -static -static-runtime -target xp -accessibility -no-opengl -no-icu -no-sql-sqlite -no-qml-debug -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 -skip qt3d
\endcode
@@ -99,7 +84,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 -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
+ 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 -skip qt3d
\endcode
\section3 Configuring Qt for OS X
@@ -107,7 +92,7 @@
We recommend that you use the following configuration options for OS X:
\code
- configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-sql-sqlite -no-qml-debug -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 -no-cups -no-sql-sqlite -no-qml-debug -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 -skip qt3d
\endcode
\section2 Setting up Qt Installer Framework
diff --git a/tools/binarycreator/binarycreator.pro b/tools/binarycreator/binarycreator.pro
index 248c2439..08c83f5a 100644
--- a/tools/binarycreator/binarycreator.pro
+++ b/tools/binarycreator/binarycreator.pro
@@ -7,8 +7,6 @@ include(../../installerfw.pri)
QT -= gui
QT += qml xml
-!minQtVersion(5,4,0): QTPLUGIN += qtaccessiblewidgets
-
CONFIG += console
DESTDIR = $$IFW_APP_PATH
SOURCES = binarycreator.cpp \