Last stand from QT_5_14refs/changes/82/11082/1

Change-Id: If8cf86e542691fed458098021c042193c4679d14

5 files changed, 120 insertions, 4 deletions

diff --git a/SOURCE/Makefile b/SOURCE/Makefile
index e29dbf7..4c75873 100644
--- a/SOURCE/Makefile
+++ b/SOURCE/Makefile
@@ -1,10 +1,11 @@
 CWD	= $(shell readlink -f .)
 
 VERSION_SHORT	= 5.14
-RELEASE = 0
+RELEASE = 2
 VERSION	= $(VERSION_SHORT).$(RELEASE)
 QT_SOURCE_ARCHIVE=qt-everywhere-src-$(VERSION).tar.xz
-DL_URL="https://download.qt.io/official_releases/qt/$(VERSION_SHORT)/$(VERSION)/single/$(QT_SOURCE_ARCHIVE)"
+QT_SOURCE_ARCHIVE2=qt-everywhere-src-$(VERSION).zip
+DL_URL="https://download.qt.io/official_releases/qt/$(VERSION_SHORT)/$(VERSION)/single"
 
 SSL_VERSION=1.0.2r
 SSL_ARCHIVE=openssl-$(SSL_VERSION).tar.gz
@@ -13,9 +14,18 @@ SSL_DL_URL = "https://www.openssl.org/source/$(SSL_ARCHIVE)"
 all: $(SSL_ARCHIVE) $(QT_SOURCE_ARCHIVE) 
 
 $(QT_SOURCE_ARCHIVE):
-	wget -c $(DL_URL) -O $(QT_SOURCE_ARCHIVE)
+	wget -c $(DL_URL)/$(QT_SOURCE_ARCHIVE) -O $(QT_SOURCE_ARCHIVE)
+
+$(QT_SOURCE_ARCHIVE2):
+	wget -c $(DL_URL)/$(QT_SOURCE_ARCHIVE2) -O $(QT_SOURCE_ARCHIVE2)
 
 $(SSL_ARCHIVE):
 	wget -c $(SSL_DL_URL) -O $(SSL_ARCHIVE)
 
+qtzip: 
+	$(MAKE) $(QT_SOURCE_ARCHIVE2)
+qttar: 
+	$(MAKE) $(QT_SOURCE_ARCHIVE)
+ssltgz: 
+	$(MAKE) $(SSL_ARCHIV)
 
diff --git a/SOURCE/mkspecs-static-runtimes.patch b/SOURCE/mkspecs-static-runtimes.patch
new file mode 100644
index 0000000..9f5f94b
--- /dev/null
+++ b/SOURCE/mkspecs-static-runtimes.patch
@@ -0,0 +1,35 @@
+diff -ruNb qt-everywhere-src-5.14.2.orig/qtbase/mkspecs/linux-g++-32/qmake.conf qt-everywhere-src-5.14.2/qtbase/mkspecs/linux-g++-32/qmake.conf
+--- qt-everywhere-src-5.14.2.orig/qtbase/mkspecs/linux-g++-32/qmake.conf	2020-03-27 10:49:31.000000000 +0100
++++ qt-everywhere-src-5.14.2/qtbase/mkspecs/linux-g++-32/qmake.conf	2020-04-19 21:02:26.869710981 +0200
+@@ -9,7 +9,7 @@
+ include(../common/linux.conf)
+ 
+ QMAKE_CFLAGS            = -m32
+-QMAKE_LFLAGS            = -m32
++QMAKE_LFLAGS            = -m32 -static-libgcc -static-libstdc++
+ 
+ include(../common/gcc-base-unix.conf)
+ include(../common/g++-unix.conf)
+diff -ruNb qt-everywhere-src-5.14.2.orig/qtbase/mkspecs/linux-g++-64/qmake.conf qt-everywhere-src-5.14.2/qtbase/mkspecs/linux-g++-64/qmake.conf
+--- qt-everywhere-src-5.14.2.orig/qtbase/mkspecs/linux-g++-64/qmake.conf	2020-03-27 10:49:31.000000000 +0100
++++ qt-everywhere-src-5.14.2/qtbase/mkspecs/linux-g++-64/qmake.conf	2020-04-19 21:02:07.453758876 +0200
+@@ -12,7 +12,7 @@
+ include(../common/linux.conf)
+ 
+ QMAKE_CFLAGS            = -m64
+-QMAKE_LFLAGS            = -m64
++QMAKE_LFLAGS            = -m64 -static-libgcc -static-libstdc++
+ 
+ include(../common/gcc-base-unix.conf)
+ include(../common/g++-unix.conf)
+diff -ruNb qt-everywhere-src-5.14.2.orig/qtbase/mkspecs/win32-g++/qmake.conf qt-everywhere-src-5.14.2/qtbase/mkspecs/win32-g++/qmake.conf
+--- qt-everywhere-src-5.14.2.orig/qtbase/mkspecs/win32-g++/qmake.conf	2020-03-27 10:49:31.000000000 +0100
++++ qt-everywhere-src-5.14.2/qtbase/mkspecs/win32-g++/qmake.conf	2020-04-19 21:03:17.773585413 +0200
+@@ -15,6 +15,7 @@
+ QMAKE_CC                = $${CROSS_COMPILE}gcc
+ QMAKE_CFLAGS           += -fno-keep-inline-dllexport
+ QMAKE_CFLAGS_WARN_ON   += -Wextra
++QMAKE_LFLAGS           += -static-libgcc -static-libstdc++
+ 
+ QMAKE_CXX               = $${CROSS_COMPILE}g++
+ QMAKE_CXXFLAGS         += -fno-keep-inline-dllexport
diff --git a/SOURCE/mkspecs-static-runtimes2.patch b/SOURCE/mkspecs-static-runtimes2.patch
new file mode 100644
index 0000000..11b9083
--- /dev/null
+++ b/SOURCE/mkspecs-static-runtimes2.patch
@@ -0,0 +1,35 @@
+diff -ruNb qt-everywhere-src-5.14.2.orig/qtbase/mkspecs/linux-g++-32/qmake.conf qt-everywhere-src-5.14.2/qtbase/mkspecs/linux-g++-32/qmake.conf
+--- qt-everywhere-src-5.14.2.orig/qtbase/mkspecs/linux-g++-32/qmake.conf	2020-03-27 10:49:31.000000000 +0100
++++ qt-everywhere-src-5.14.2/qtbase/mkspecs/linux-g++-32/qmake.conf	2020-04-19 21:02:26.869710981 +0200
+@@ -9,7 +9,7 @@
+ include(../common/linux.conf)
+ 
+ QMAKE_CFLAGS            = -m32
+-QMAKE_LFLAGS            = -m32
++QMAKE_LFLAGS            = -m32 -static-libgcc -static-libstdc++
+ 
+ include(../common/gcc-base-unix.conf)
+ include(../common/g++-unix.conf)
+diff -ruNb qt-everywhere-src-5.14.2.orig/qtbase/mkspecs/linux-g++-64/qmake.conf qt-everywhere-src-5.14.2/qtbase/mkspecs/linux-g++-64/qmake.conf
+--- qt-everywhere-src-5.14.2.orig/qtbase/mkspecs/linux-g++-64/qmake.conf	2020-03-27 10:49:31.000000000 +0100
++++ qt-everywhere-src-5.14.2/qtbase/mkspecs/linux-g++-64/qmake.conf	2020-04-19 21:02:07.453758876 +0200
+@@ -12,7 +12,7 @@
+ include(../common/linux.conf)
+ 
+ QMAKE_CFLAGS            = -m64
+-QMAKE_LFLAGS            = -m64
++QMAKE_LFLAGS            = -m64 -static-libgcc -static-libstdc++
+ 
+ include(../common/gcc-base-unix.conf)
+ include(../common/g++-unix.conf)
+diff -ruNb qt-everywhere-src-5.14.2.orig/qtbase/mkspecs/win32-g++/qmake.conf qt-everywhere-src-5.14.2/qtbase/mkspecs/win32-g++/qmake.conf
+--- qt-everywhere-src-5.14.2.orig/qtbase/mkspecs/win32-g++/qmake.conf	2020-03-27 10:49:31.000000000 +0100
++++ qt-everywhere-src-5.14.2/qtbase/mkspecs/win32-g++/qmake.conf	2020-04-19 21:23:18.170624479 +0200
+@@ -15,6 +15,7 @@
+ QMAKE_CC                = $${CROSS_COMPILE}gcc
+ QMAKE_CFLAGS           += -fno-keep-inline-dllexport
+ QMAKE_CFLAGS_WARN_ON   += -Wextra
++QMAKE_LFLAGS           += -static-libgcc -static-libstdc++ -Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive -Wl,-Bdynamic
+ 
+ QMAKE_CXX               = $${CROSS_COMPILE}g++
+ QMAKE_CXXFLAGS         += -fno-keep-inline-dllexport
diff --git a/SOURCE/qt-5.12.3-cross-static-gcc-libs.patch b/SOURCE/qt-5.12.3-cross-static-gcc-libs.patch
index 017c5a9..912a5e1 100644
--- a/SOURCE/qt-5.12.3-cross-static-gcc-libs.patch
+++ b/SOURCE/qt-5.12.3-cross-static-gcc-libs.patch
@@ -6,7 +6,7 @@ diff -ruNb qt-everywhere-src-5.12.3.orig/qtbase/mkspecs/common/g++-win32.conf qt
  include(angle.conf)
  include(windows-vulkan.conf)
 +
-+QMAKE_LFLAGS            += -static-libgcc -static-libstdc++
++QMAKE_LFLAGS            += -static-libgcc -static-libstdc++ -Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive -Wl,-Bdynamic
 diff -ruNb qt-everywhere-src-5.12.3.orig/qtbase/mkspecs/x-win32-g++/qmake.conf qt-everywhere-src-5.12.3/qtbase/mkspecs/x-win32-g++/qmake.conf
 --- qt-everywhere-src-5.12.3.orig/qtbase/mkspecs/x-win32-g++/qmake.conf	1970-01-01 01:00:00.000000000 +0100
 +++ qt-everywhere-src-5.12.3/qtbase/mkspecs/x-win32-g++/qmake.conf	2019-05-31 08:59:13.555027712 +0200
diff --git a/SOURCE/qt-creator-dllexport.patch b/SOURCE/qt-creator-dllexport.patch
new file mode 100644
index 0000000..04b185d
--- /dev/null
+++ b/SOURCE/qt-creator-dllexport.patch
@@ -0,0 +1,36 @@
+diff -ruNb qt-creator-opensource-src-4.11.2.orig/src/libs/sqlite/sqlite.pro qt-creator-opensource-src-4.11.2/src/libs/sqlite/sqlite.pro
+--- qt-creator-opensource-src-4.11.2.orig/src/libs/sqlite/sqlite.pro	2020-03-27 04:34:54.000000000 +0100
++++ qt-creator-opensource-src-4.11.2/src/libs/sqlite/sqlite.pro	2020-04-20 19:03:50.059094604 +0200
+@@ -3,7 +3,7 @@
+ 
+ include(../../qtcreatorlibrary.pri)
+ 
+-win32:DEFINES += SQLITE_API=__declspec(dllexport)
++win32:DEFINES += SQLITE_API=__declspec\\(dllexport\\)
+ unix:DEFINES += SQLITE_API=\"__attribute__((visibility(\\\"default\\\")))\"
+ 
+ include(sqlite-lib.pri)
+diff -ruNb qt-creator-opensource-src-4.11.2.orig/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp qt-creator-opensource-src-4.11.2/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
+--- qt-creator-opensource-src-4.11.2.orig/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp	2020-03-27 04:34:54.000000000 +0100
++++ qt-creator-opensource-src-4.11.2/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp	2020-04-20 20:26:17.486219748 +0200
+@@ -54,7 +54,7 @@
+ #include <QTimer>
+ 
+ #ifdef Q_OS_WIN
+-#include <Windows.h>
++#include <windows.h>
+ #endif
+ 
+ using namespace ProjectExplorer;
+diff -ruNb qt-creator-opensource-src-4.11.2.orig/src/tools/winrtdebughelper/winrtdebughelper.cpp qt-creator-opensource-src-4.11.2/src/tools/winrtdebughelper/winrtdebughelper.cpp
+--- qt-creator-opensource-src-4.11.2.orig/src/tools/winrtdebughelper/winrtdebughelper.cpp	2020-03-27 04:34:56.000000000 +0100
++++ qt-creator-opensource-src-4.11.2/src/tools/winrtdebughelper/winrtdebughelper.cpp	2020-04-20 20:41:14.599066226 +0200
+@@ -23,7 +23,7 @@
+ **
+ ****************************************************************************/
+ 
+-#include <Windows.h>
++#include <windows.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+