From f8f275f7c81f5d364c77b1e67d526ead77c450eb Mon Sep 17 00:00:00 2001
From: Faraz Fallahi <fffaraz@gmail.com>
Date: Fri, 5 Jun 2020 00:29:34 -0400
Subject: [PATCH] update

---
 notes.txt         |  4 ++++
 static/Dockerfile | 35 ++++++++++++++++++++---------------
 win32/Dockerfile  |  2 +-
 win64/Dockerfile  |  2 +-
 4 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/notes.txt b/notes.txt
index fdc28da..83d2aba 100644
--- a/notes.txt
+++ b/notes.txt
@@ -1 +1,5 @@
 https://github.com/darkmattercoder/qt-build
+
+echo 'override MXE_PLUGIN_DIRS += plugins/gcc7' >> settings.mk
+
+qtbase qtcharts qtdeclarative qtquickcontrols qtquickcontrols2
diff --git a/static/Dockerfile b/static/Dockerfile
index 3b4ef5a..4d34490 100644
--- a/static/Dockerfile
+++ b/static/Dockerfile
@@ -5,22 +5,27 @@ RUN \
     export DEBIAN_FRONTEND=noninteractive && \
     apt -y update && \
     apt -y upgrade && \
-    apt -y install build-essential cmake gdb git iputils-ping nano perl python valgrind wget && \
-    apt -y install mesa-common-dev libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev && \
-    apt -y install zlib1g-dev libssl-dev libnss3-dev libmysqlclient-dev libsqlite3-dev libxslt-dev libxml2-dev libjpeg-dev libpng-dev libopus-dev && \
-    apt -y install libxcursor-dev libxcb1-dev libxcb-xkb-dev libx11-xcb-dev libxrender-dev libxi-dev libxcb-xinerama0-dev && \
+    apt -y install build-essential cmake gdb git iputils-ping nano perl python valgrind wget lzip \
+        mesa-common-dev libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev \
+        zlib1g-dev libssl-dev libnss3-dev libmysqlclient-dev libsqlite3-dev libxslt-dev libxml2-dev libjpeg-dev libpng-dev libopus-dev \
+        libxcursor-dev libxcb1-dev libxcb-xkb-dev libx11-xcb-dev libxrender-dev libxi-dev libxcb-xinerama0-dev && \
     apt -y autoremove && \
     apt -y autoclean && \
-    cd /opt && \
-    wget -q http://download.qt.io/official_releases/qt/5.9/5.9.0/single/qt-everywhere-opensource-src-5.9.0.tar.xz && \
-    tar xf qt-everywhere-opensource-src-5.9.0.tar.xz && \
-    rm qt-everywhere-opensource-src-5.9.0.tar.xz && \
-    cd qt-everywhere-opensource-src-5.9.0 && \
-    ./configure -opensource -confirm-license -release -static -nomake tests -nomake examples -no-compile-examples && \
-    make -j $(($(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1)+2)) && \
-    make install && \
-    cd /opt && \
-    rm -rf qt-everywhere-opensource-src-5.9.0 && \
+    apt -y clean && \
+    rm -rf /var/lib/apt/lists/* && \
     exit 0
 
-ENV PATH="${PATH}:/usr/local/Qt-5.9.0/bin"
+RUN \
+    cd /opt && \
+    wget -q http://download.qt.io/official_releases/qt/5.15/5.15.0/single/qt-everywhere-opensource-src-5.15.0.tar.xz && \
+    tar xf qt-everywhere-opensource-src-5.15.0.tar.xz && \
+    rm qt-everywhere-opensource-src-5.15.0.tar.xz && \
+    cd qt-everywhere-opensource-src-5.15.0 && \
+    ./configure -opensource -confirm-license -release -static -nomake tests -nomake examples -no-compile-examples && \
+    make -j $(($(nproc)+4)) && \
+    make install && \
+    cd /opt && \
+    rm -rf qt-everywhere-opensource-src-5.15.0 && \
+    exit 0
+
+ENV PATH="${PATH}:/usr/local/Qt-5.15.0/bin"
diff --git a/win32/Dockerfile b/win32/Dockerfile
index 2732b19..ab49bd1 100644
--- a/win32/Dockerfile
+++ b/win32/Dockerfile
@@ -9,7 +9,7 @@ RUN \
         autoconf automake autopoint bash bison bzip2 flex gettext \
         git g++ gperf intltool libffi-dev libgdk-pixbuf2.0-dev \
         libtool-bin libltdl-dev libssl-dev libxml-parser-perl lzip make \
-        openssl p7zip-full patch perl pkg-config python ruby scons \
+        openssl p7zip-full lzip patch perl pkg-config python ruby scons \
         sed unzip wget xz-utils \
         g++-multilib libc6-dev-i386 && \
     apt -y autoremove && \
diff --git a/win64/Dockerfile b/win64/Dockerfile
index 535b89b..eaee1bf 100644
--- a/win64/Dockerfile
+++ b/win64/Dockerfile
@@ -9,7 +9,7 @@ RUN \
         autoconf automake autopoint bash bison bzip2 flex gettext \
         git g++ gperf intltool libffi-dev libgdk-pixbuf2.0-dev \
         libtool-bin libltdl-dev libssl-dev libxml-parser-perl lzip make \
-        openssl p7zip-full patch perl pkg-config python ruby scons \
+        openssl p7zip-full lzip patch perl pkg-config python ruby scons \
         sed unzip wget xz-utils \
         g++-multilib libc6-dev-i386 && \
     apt -y autoremove && \