diff --git a/0001-Decrease-focusInTimer-timer-from-400-to-200.patch b/0001-Decrease-focusInTimer-timer-from-400-to-200.patch
deleted file mode 100644
index aca0ed4..0000000
--- a/0001-Decrease-focusInTimer-timer-from-400-to-200.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 75a6b34e363f20664828f2e276de468a2ad4c9a6 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Wed, 3 Jul 2019 20:55:27 +0200
-Subject: [PATCH] Decrease focusInTimer timer from 400 to 200
-
-Workaround for focus issues with VirtualBox (QTBUG-76742).
----
- src/plugins/platforms/xcb/qxcbwindow.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
-index 9382488b74..a449ad8349 100644
---- a/src/plugins/platforms/xcb/qxcbwindow.cpp
-+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
-@@ -848,7 +848,7 @@ void QXcbWindow::doFocusOut()
-     connection()->setFocusWindow(nullptr);
-     relayFocusToModalWindow();
-     // Do not set the active window to nullptr if there is a FocusIn coming.
--    connection()->focusInTimer().start(400);
-+    connection()->focusInTimer().start(200);
- }
- 
- struct QtMotifWmHints {
--- 
-2.22.0
-
diff --git a/0001-Fix-CMake-config-files-for-libdir-different-from-lib.patch b/0001-Fix-CMake-config-files-for-libdir-different-from-lib.patch
new file mode 100644
index 0000000..590d356
--- /dev/null
+++ b/0001-Fix-CMake-config-files-for-libdir-different-from-lib.patch
@@ -0,0 +1,37 @@
+From dc5362ac7d766a9c1b4ae328bc6ce8a1aa332773 Mon Sep 17 00:00:00 2001
+From: Joerg Bornemann <joerg.bornemann@qt.io>
+Date: Fri, 6 Sep 2019 10:54:44 +0200
+Subject: [PATCH] Fix CMake config files for -libdir different from "lib"
+
+When Qt was configured with -libdir different from "lib", one could not
+build with CMake whenever a static lib was pulled in (e.g. uitools).
+
+Do not hard-code "/lib" but use the correct variable also for static
+libraries.
+
+Fixes: QTBUG-76255
+Change-Id: I28c6861752e29e461247628d2b1f8a9ec32f0790
+---
+ mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+index d4fd057682..f4a34d6e48 100644
+--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+@@ -53,7 +53,11 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
+     set(_lib_deps)
+     set(_link_flags)
+ 
+-    get_filename_component(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" ABSOLUTE)
++!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
++    set(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}\")
++!!ELSE
++    set(_qt5_install_libs \"$${CMAKE_LIB_DIR}\")
++!!ENDIF
+ 
+     if(EXISTS \"${prl_file_location}\")
+         file(STRINGS \"${prl_file_location}\" _prl_strings REGEX \"QMAKE_PRL_LIBS_FOR_CMAKE[ \\t]*=\")
+-- 
+2.22.0
+
diff --git a/0001-Fix-crash-with-drag-cursor-handling.patch b/0001-Fix-crash-with-drag-cursor-handling.patch
deleted file mode 100644
index 2ef8818..0000000
--- a/0001-Fix-crash-with-drag-cursor-handling.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From d1141b6c90e53554f69fd6a7a272988211f5bd34 Mon Sep 17 00:00:00 2001
-From: Joni Poikelin <joni.poikelin@qt.io>
-Date: Thu, 28 Feb 2019 09:54:20 +0200
-Subject: [PATCH] Fix crash with drag cursor handling
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-7a7c722782a435f7c01b94f48df7a5f4ff4d599e caused a regresssion in some
-cases.
-
-Change-Id: I1089a79534d811b195de663ff664d9ba5a6ac6c5
-Fixes: QTBUG-74110
-Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
----
- src/gui/kernel/qsimpledrag.cpp | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/src/gui/kernel/qsimpledrag.cpp b/src/gui/kernel/qsimpledrag.cpp
-index 9aab332ef5..bd409c124f 100644
---- a/src/gui/kernel/qsimpledrag.cpp
-+++ b/src/gui/kernel/qsimpledrag.cpp
-@@ -310,11 +310,15 @@ void QBasicDrag::updateCursor(Qt::DropAction action)
-         m_dndHasSetOverrideCursor = true;
-     } else {
-         QCursor *cursor = QGuiApplication::overrideCursor();
--        if (!pixmap.isNull()) {
--            if (cursor->pixmap().cacheKey() != pixmap.cacheKey())
--                QGuiApplication::changeOverrideCursor(QCursor(pixmap));
--        } else if (cursorShape != cursor->shape()) {
--            QGuiApplication::changeOverrideCursor(QCursor(cursorShape));
-+        if (!cursor) {
-+            QGuiApplication::changeOverrideCursor(pixmap.isNull() ? QCursor(cursorShape) : QCursor(pixmap));
-+        } else {
-+            if (!pixmap.isNull()) {
-+                if (cursor->pixmap().cacheKey() != pixmap.cacheKey())
-+                    QGuiApplication::changeOverrideCursor(QCursor(pixmap));
-+            } else if (cursorShape != cursor->shape()) {
-+                QGuiApplication::changeOverrideCursor(QCursor(cursorShape));
-+            }
-         }
-     }
- #endif
--- 
-2.22.0
-
diff --git a/0001-Fix-meta-file-replacements-if-matches-are-empty.patch b/0001-Fix-meta-file-replacements-if-matches-are-empty.patch
deleted file mode 100644
index 946df94..0000000
--- a/0001-Fix-meta-file-replacements-if-matches-are-empty.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 60136b1a846ca5aedeb588edaa178927abb002ec Mon Sep 17 00:00:00 2001
-From: Joerg Bornemann <joerg.bornemann@qt.io>
-Date: Mon, 3 Jun 2019 14:39:07 +0200
-Subject: Fix meta file replacements if matches are empty
-
-QMake code like
-    rplc.match =
-    QMAKE_PRL_INSTALL_REPLACE += rplc
-led to the generation of invalid sed calls in the Makefile.
-
-It is already actively checked for empty matches, but if *all* matches
-are empty, the sed call looks like
-    sed foo > bar
-which is invalid.
-
-Task-number: QTBUG-75901
-Change-Id: I173ed99826414dcf06253a15a247f7d067ee3977
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
----
- qmake/generators/makefile.cpp | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index bfef31f17e..6edaf1f70e 100644
---- a/qmake/generators/makefile.cpp
-+++ b/qmake/generators/makefile.cpp
-@@ -3437,19 +3437,23 @@ QString MakefileGenerator::installMetaFile(const ProKey &replace_rule, const QSt
-         || project->isActiveConfig("no_sed_meta_install")) {
-         ret += "-$(INSTALL_FILE) " + escapeFilePath(src) + ' ' + escapeFilePath(dst);
-     } else {
--        ret += "-$(SED)";
-+        QString sedargs;
-         const ProStringList &replace_rules = project->values(replace_rule);
-         for (int r = 0; r < replace_rules.size(); ++r) {
-             const ProString match = project->first(ProKey(replace_rules.at(r) + ".match")),
-                         replace = project->first(ProKey(replace_rules.at(r) + ".replace"));
-             if (!match.isEmpty() /*&& match != replace*/) {
--                ret += " -e " + shellQuote("s," + match + "," + replace + ",g");
-+                sedargs += " -e " + shellQuote("s," + match + "," + replace + ",g");
-                 if (isWindowsShell() && project->first(ProKey(replace_rules.at(r) + ".CONFIG")).contains("path"))
--                    ret += " -e " + shellQuote("s," + windowsifyPath(match.toQString())
-+                    sedargs += " -e " + shellQuote("s," + windowsifyPath(match.toQString())
-                                                + "," + windowsifyPath(replace.toQString()) + ",gi");
-             }
-         }
--        ret += ' ' + escapeFilePath(src) + " > " + escapeFilePath(dst);
-+        if (sedargs.isEmpty()) {
-+            ret += "-$(INSTALL_FILE) " + escapeFilePath(src) + ' ' + escapeFilePath(dst);
-+        } else {
-+            ret += "-$(SED) " + sedargs + ' ' + escapeFilePath(src) + " > " + escapeFilePath(dst);
-+        }
-     }
-     return ret;
- }
--- 
-cgit v1.2.1
-
diff --git a/0001-Revert-Fix-QMAKE_PRL_INSTALL_REPLACE-for-macOS.patch b/0001-Revert-Fix-QMAKE_PRL_INSTALL_REPLACE-for-macOS.patch
deleted file mode 100644
index f158688..0000000
--- a/0001-Revert-Fix-QMAKE_PRL_INSTALL_REPLACE-for-macOS.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From a473f90a3637255d8443ab8621b57a3e9d90b031 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Thu, 6 Jun 2019 20:05:27 +0200
-Subject: [PATCH 1/3] Revert "Fix QMAKE_PRL_INSTALL_REPLACE for macOS"
-
-This reverts commit 015d7f16cb0b6812950caa3bcde3b6758403ae34.
----
- mkspecs/features/qt_common.prf | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
-index e64dfa98c2..17a07dbab9 100644
---- a/mkspecs/features/qt_common.prf
-+++ b/mkspecs/features/qt_common.prf
-@@ -49,14 +49,10 @@ contains(TEMPLATE, .*lib) {
-         lib_replace.match = $$rplbase/lib
-         lib_replace.replace = $$qqt_libdir
-     }
-+    !equals(qt_libdir, $$rplbase/lib): \
-+        lib_replace.match = \\($$lib_replace.match\\)\\|\\($$qt_libdir\\)
-     lib_replace.CONFIG = path
-     QMAKE_PRL_INSTALL_REPLACE += lib_replace
--    !equals(qt_libdir, $$rplbase/lib) {
--        qtlibdir_replace.match = $$qt_libdir
--        qtlibdir_replace.replace = $$qqt_libdir
--        qtlibdir_replace.CONFIG = path
--        QMAKE_PRL_INSTALL_REPLACE += qtlibdir_replace
--    }
- }
- 
- # The remainder of this file must not apply to host tools/libraries,
--- 
-2.21.0
-
diff --git a/0001-Revert-qmake-link-qt-libraries-by-full-path.patch b/0001-Revert-qmake-link-qt-libraries-by-full-path.patch
deleted file mode 100644
index 53bbe74..0000000
--- a/0001-Revert-qmake-link-qt-libraries-by-full-path.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From c28456522b71dfb207bfe47f91d6b0eeaec109bf Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Fri, 7 Jun 2019 13:31:40 +0200
-Subject: [PATCH] Revert "qmake: link qt libraries by full path"
-
-This reverts commit 5b3dfa470ed7ea40103daa785286ab71fb7aa230.
----
- mkspecs/features/qt.prf            | 31 +++++++++++++++++-------------
- mkspecs/features/win32/opengl.prf  | 16 ++++-----------
- mkspecs/features/win32/windows.prf |  7 ++++---
- mkspecs/linux-lsb-g++/qmake.conf   |  1 +
- 4 files changed, 27 insertions(+), 28 deletions(-)
-
-diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index 3a71376029..5ac640190a 100644
---- a/mkspecs/features/qt.prf
-+++ b/mkspecs/features/qt.prf
-@@ -145,14 +145,12 @@ import_plugins:qtConfig(static) {
-         # the plugin path. Unknown plugins must rely on the default link path.
-         plug_type = $$eval(QT_PLUGIN.$${plug}.TYPE)
-         !isEmpty(plug_type) {
--            plug_name = $$QMAKE_PREFIX_STATICLIB$${plug}$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB
-             plug_path = $$eval(QT_PLUGIN.$${plug}.PATH)
-             isEmpty(plug_path): \
-                 plug_path = $$[QT_INSTALL_PLUGINS/get]
--            LIBS += $$plug_path/$$plug_type/$$plug_name
--        } else {
--            LIBS += -l$${plug}$$qtPlatformTargetSuffix()
-+            LIBS += -L$$plug_path/$$plug_type
-         }
-+        LIBS += -l$${plug}$$qtPlatformTargetSuffix()
-     }
- }
- 
-@@ -197,6 +195,8 @@ for(ever) {
-         qtProcessModuleFlags(DEFINES, QT.$${QTLIB}.DEFINES)
- 
-         MODULE_INCLUDES -= $$QMAKE_DEFAULT_INCDIRS
-+        MODULE_LIBS_ADD = $$MODULE_LIBS
-+        MODULE_LIBS_ADD -= $$QMAKE_DEFAULT_LIBDIRS
- 
-         # Frameworks shouldn't need include paths, but much code does not use
-         # module-qualified #includes, so by default we add paths which point
-@@ -209,17 +209,23 @@ for(ever) {
-         !isEmpty(MODULE_MODULE) {
-             contains(MODULE_CONFIG, lib_bundle) {
-                 framework = $$MODULE_MODULE
--                # Linking frameworks by absolute path does not work.
-                 LIBS$$var_sfx += -framework $$framework
-             } else {
-+                !isEmpty(MODULE_LIBS_ADD): \
-+                    LIBS$$var_sfx += -L$$MODULE_LIBS_ADD
-+
-                 lib = $$MODULE_MODULE$$qtPlatformTargetSuffix()
--                win32|contains(MODULE_CONFIG, staticlib) {
--                    lib = $$MODULE_LIBS/$$QMAKE_PREFIX_STATICLIB$${lib}.$$QMAKE_EXTENSION_STATICLIB
--                    PRE_TARGETDEPS += $$lib
--                } else {
--                    lib = $$MODULE_LIBS/$$QMAKE_PREFIX_SHLIB$${lib}.$$QMAKE_EXTENSION_SHLIB
-+                LIBS$$var_sfx += -l$$lib
-+
-+                contains(MODULE_CONFIG, staticlib): \
-+                    PRE_TARGETDEPS *= $$MODULE_LIBS/$${QMAKE_PREFIX_STATICLIB}$${lib}.$${QMAKE_EXTENSION_STATICLIB}
-+
-+                !isEmpty(QMAKE_LSB) {
-+                    !isEmpty(MODULE_LIBS_ADD): \
-+                        QMAKE_LFLAGS *= --lsb-libpath=$$MODULE_LIBS_ADD
-+                    QMAKE_LFLAGS *= --lsb-shared-libs=$$lib
-+                    QMAKE_LIBDIR *= /opt/lsb/lib
-                 }
--                LIBS$$var_sfx += $$lib
-             }
-         }
-         QMAKE_USE$$var_sfx += $$MODULE_USES
-@@ -289,8 +295,7 @@ contains(all_qt_module_deps, qml): \
-         for (key, IMPORTS._KEYS_) {
-             PATH = $$eval(IMPORTS.$${key}.path)
-             PLUGIN = $$eval(IMPORTS.$${key}.plugin)
--            !isEmpty(PATH):!isEmpty(PLUGIN): \
--                LIBS += $$PATH/$$QMAKE_PREFIX_STATICLIB$${PLUGIN}$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB
-+            !isEmpty(PATH):!isEmpty(PLUGIN): LIBS *= -L$$PATH -l$${PLUGIN}$$qtPlatformTargetSuffix()
-         }
- 
-         # create qml_plugin_import.cpp
-diff --git a/mkspecs/features/win32/opengl.prf b/mkspecs/features/win32/opengl.prf
-index f21848f941..c6fba7770f 100644
---- a/mkspecs/features/win32/opengl.prf
-+++ b/mkspecs/features/win32/opengl.prf
-@@ -1,21 +1,13 @@
- QT_FOR_CONFIG += gui
- 
--defineTest(prependOpenGlLib) {
--    path = $$QT.core.libs/$$QMAKE_PREFIX_STATICLIB$$1
--    ext = .$$QMAKE_EXTENSION_STATICLIB
--    QMAKE_LIBS_OPENGL_ES2 = $${path}$${ext} $$QMAKE_LIBS_OPENGL_ES2
--    QMAKE_LIBS_OPENGL_ES2_DEBUG = $${path}d$${ext} $$QMAKE_LIBS_OPENGL_ES2_DEBUG
--    export(QMAKE_LIBS_OPENGL_ES2)
--    export(QMAKE_LIBS_OPENGL_ES2_DEBUG)
--}
--
- qtConfig(opengles2) {
-     # Depending on the configuration we use libQtANGLE or libEGL and libGLESv2
-     qtConfig(combined-angle-lib) {
--        prependOpenGlLib($$LIBQTANGLE_NAME)
-+        QMAKE_LIBS_OPENGL_ES2 = -l$${LIBQTANGLE_NAME} $$QMAKE_LIBS_OPENGL_ES2
-+        QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBQTANGLE_NAME}d $$QMAKE_LIBS_OPENGL_ES2_DEBUG
-     } else {
--        prependOpenGlLib($$LIBGLESV2_NAME)
--        prependOpenGlLib($$LIBEGL_NAME)
-+        QMAKE_LIBS_OPENGL_ES2 = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} $$QMAKE_LIBS_OPENGL_ES2
-+        QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME}d -l$${LIBGLESV2_NAME}d $$QMAKE_LIBS_OPENGL_ES2_DEBUG
-     }
- #   For Desktop, use the ANGLE library location passed on from configure.
-     INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2
-diff --git a/mkspecs/features/win32/windows.prf b/mkspecs/features/win32/windows.prf
-index 272170d428..ecb167bf18 100644
---- a/mkspecs/features/win32/windows.prf
-+++ b/mkspecs/features/win32/windows.prf
-@@ -6,9 +6,10 @@ contains(TEMPLATE, ".*app") {
- 
-     qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) {
-         isEqual(entryLib, -lqtmain) {
--            lib = $$QT.core.libs/$${QMAKE_PREFIX_STATICLIB}qtmain$$QT_LIBINFIX$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB
--            PRE_TARGETDEPS += $$lib
--            QMAKE_LIBS += $$lib
-+            !contains(QMAKE_DEFAULT_LIBDIRS, $$QT.core.libs): \
-+                QMAKE_LIBS += -L$$QT.core.libs
-+            CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d
-+            else: QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}
-         } else {
-             QMAKE_LIBS += $${entryLib}
-         }
-diff --git a/mkspecs/linux-lsb-g++/qmake.conf b/mkspecs/linux-lsb-g++/qmake.conf
-index eb7b87b57b..80353cd5f6 100644
---- a/mkspecs/linux-lsb-g++/qmake.conf
-+++ b/mkspecs/linux-lsb-g++/qmake.conf
-@@ -13,6 +13,7 @@ load(qt_config)
- 
- QMAKE_LIBS_THREAD      += -lrt
- 
-+QMAKE_LSB               = 1
- QMAKE_CC                = lsbcc
- QMAKE_CXX               = lsbc++
- 
--- 
-2.21.0
-
diff --git a/0002-Do-not-write-Libs-into-.pc-files-if-TEMPLATE-is-not-.patch b/0002-Do-not-write-Libs-into-.pc-files-if-TEMPLATE-is-not-.patch
deleted file mode 100644
index 108afa9..0000000
--- a/0002-Do-not-write-Libs-into-.pc-files-if-TEMPLATE-is-not-.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From c64f8ca232cc1f2131282d9eb6279ef9b565be88 Mon Sep 17 00:00:00 2001
-From: Joerg Bornemann <joerg.bornemann@qt.io>
-Date: Mon, 3 Jun 2019 14:52:49 +0200
-Subject: Do not write 'Libs:' into .pc files if TEMPLATE is not 'lib'
-
-Especially for header modules we don't want a 'Libs:' entry in their
-.pc file.
-
-Task-number: QTBUG-75901
-Change-Id: I39037d3132e39dd360532e1425f794ebec28e0bd
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
----
- qmake/generators/makefile.cpp | 74 ++++++++++++++++++++++---------------------
- 1 file changed, 38 insertions(+), 36 deletions(-)
-
-diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 6edaf1f70e..4a99a60892 100644
---- a/qmake/generators/makefile.cpp
-+++ b/qmake/generators/makefile.cpp
-@@ -3359,42 +3359,44 @@ MakefileGenerator::writePkgConfigFile()
-     if (!version.isEmpty())
-         t << "Version: " << version << endl;
- 
--    // libs
--    t << "Libs: ";
--    QString pkgConfiglibName;
--    if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle")) {
--        if (libDir != QLatin1String("/Library/Frameworks"))
--            t << "-F${libdir} ";
--        ProString bundle;
--        if (!project->isEmpty("QMAKE_FRAMEWORK_BUNDLE_NAME"))
--            bundle = project->first("QMAKE_FRAMEWORK_BUNDLE_NAME");
--        else
--            bundle = project->first("TARGET");
--        int suffix = bundle.lastIndexOf(".framework");
--        if (suffix != -1)
--            bundle = bundle.left(suffix);
--        t << "-framework ";
--        pkgConfiglibName = bundle.toQString();
--    } else {
--        if (!project->values("QMAKE_DEFAULT_LIBDIRS").contains(libDir))
--            t << "-L${libdir} ";
--        pkgConfiglibName = "-l" + project->first("QMAKE_ORIG_TARGET");
--        if (project->isActiveConfig("shared"))
--            pkgConfiglibName += project->first("TARGET_VERSION_EXT").toQString();
--    }
--    t << shellQuote(pkgConfiglibName) << " \n";
--
--    if (project->isActiveConfig("staticlib")) {
--        ProStringList libs;
--        libs << "LIBS";  // FIXME: this should not be conditional on staticlib
--        libs << "LIBS_PRIVATE";
--        libs << "QMAKE_LIBS";  // FIXME: this should not be conditional on staticlib
--        libs << "QMAKE_LIBS_PRIVATE";
--        libs << "QMAKE_LFLAGS_THREAD"; //not sure about this one, but what about things like -pthread?
--        t << "Libs.private:";
--        for (ProStringList::ConstIterator it = libs.cbegin(); it != libs.cend(); ++it)
--            t << ' ' << fixLibFlags((*it).toKey()).join(' ');
--        t << endl;
-+    if (project->first("TEMPLATE") == "lib") {
-+        // libs
-+        t << "Libs: ";
-+        QString pkgConfiglibName;
-+        if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle")) {
-+            if (libDir != QLatin1String("/Library/Frameworks"))
-+                t << "-F${libdir} ";
-+            ProString bundle;
-+            if (!project->isEmpty("QMAKE_FRAMEWORK_BUNDLE_NAME"))
-+                bundle = project->first("QMAKE_FRAMEWORK_BUNDLE_NAME");
-+            else
-+                bundle = project->first("TARGET");
-+            int suffix = bundle.lastIndexOf(".framework");
-+            if (suffix != -1)
-+                bundle = bundle.left(suffix);
-+            t << "-framework ";
-+            pkgConfiglibName = bundle.toQString();
-+        } else {
-+            if (!project->values("QMAKE_DEFAULT_LIBDIRS").contains(libDir))
-+                t << "-L${libdir} ";
-+            pkgConfiglibName = "-l" + project->first("QMAKE_ORIG_TARGET");
-+            if (project->isActiveConfig("shared"))
-+                pkgConfiglibName += project->first("TARGET_VERSION_EXT").toQString();
-+        }
-+        t << shellQuote(pkgConfiglibName) << " \n";
-+
-+        if (project->isActiveConfig("staticlib")) {
-+            ProStringList libs;
-+            libs << "LIBS";  // FIXME: this should not be conditional on staticlib
-+            libs << "LIBS_PRIVATE";
-+            libs << "QMAKE_LIBS";  // FIXME: this should not be conditional on staticlib
-+            libs << "QMAKE_LIBS_PRIVATE";
-+            libs << "QMAKE_LFLAGS_THREAD"; //not sure about this one, but what about things like -pthread?
-+            t << "Libs.private:";
-+            for (ProStringList::ConstIterator it = libs.cbegin(); it != libs.cend(); ++it)
-+                t << ' ' << fixLibFlags((*it).toKey()).join(' ');
-+            t << endl;
-+        }
-     }
- 
-     // flags
--- 
-cgit v1.2.1
-
diff --git a/0002-Revert-Replace-absolute-Qt-lib-dir-in-.prl-files.patch b/0002-Revert-Replace-absolute-Qt-lib-dir-in-.prl-files.patch
deleted file mode 100644
index a0b5b88..0000000
--- a/0002-Revert-Replace-absolute-Qt-lib-dir-in-.prl-files.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 71b2d89fd5e3427b767e29b5f0bb6d4ca41806fa Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Thu, 6 Jun 2019 20:05:37 +0200
-Subject: [PATCH 2/3] Revert "Replace absolute Qt lib dir in .prl files"
-
-This reverts commit f00de3322e05c62021082463b6de24805afc1355.
----
- mkspecs/features/qt_common.prf | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
-index 17a07dbab9..e51aa4766b 100644
---- a/mkspecs/features/qt_common.prf
-+++ b/mkspecs/features/qt_common.prf
-@@ -49,8 +49,6 @@ contains(TEMPLATE, .*lib) {
-         lib_replace.match = $$rplbase/lib
-         lib_replace.replace = $$qqt_libdir
-     }
--    !equals(qt_libdir, $$rplbase/lib): \
--        lib_replace.match = \\($$lib_replace.match\\)\\|\\($$qt_libdir\\)
-     lib_replace.CONFIG = path
-     QMAKE_PRL_INSTALL_REPLACE += lib_replace
- }
--- 
-2.21.0
-
diff --git a/0002-xcb-Use-the-screen-s-physical-DPI-as-logical-DPI-unl.patch b/0002-xcb-Use-the-screen-s-physical-DPI-as-logical-DPI-unl.patch
index c41d7c1..f70b2ac 100644
--- a/0002-xcb-Use-the-screen-s-physical-DPI-as-logical-DPI-unl.patch
+++ b/0002-xcb-Use-the-screen-s-physical-DPI-as-logical-DPI-unl.patch
@@ -14,16 +14,15 @@ Task-number: QTBUG-67928
  src/plugins/platforms/xcb/qxcbscreen.cpp | 10 +++++++++-
  1 file changed, 9 insertions(+), 1 deletion(-)
 
-Index: qtbase-everywhere-src-5.11.2/src/plugins/platforms/xcb/qxcbscreen.cpp
+Index: qtbase-everywhere-src-5.13.1/src/plugins/platforms/xcb/qxcbscreen.cpp
 ===================================================================
---- qtbase-everywhere-src-5.11.2.orig/src/plugins/platforms/xcb/qxcbscreen.cpp
-+++ qtbase-everywhere-src-5.11.2/src/plugins/platforms/xcb/qxcbscreen.cpp
-@@ -681,7 +681,15 @@ QDpi QXcbScreen::logicalDpi() const
-     if (forcedDpi > 0) {
+--- qtbase-everywhere-src-5.13.1.orig/src/plugins/platforms/xcb/qxcbscreen.cpp
++++ qtbase-everywhere-src-5.13.1/src/plugins/platforms/xcb/qxcbscreen.cpp
+@@ -676,7 +676,14 @@ QDpi QXcbScreen::logicalDpi() const
+     if (forcedDpi > 0)
          return QDpi(forcedDpi, forcedDpi);
-     }
+ 
 -    return m_virtualDesktop->dpi();
-+
 +    // By default, X fakes the virtual size to be 96 dpi (+-rounding),
 +    // so if it's different the user overwrote it.
 +    if (qRound(m_virtualDesktop->dpi().first) != 96 ||
diff --git a/0003-Add-an-ID-for-recognition-of-UGEE-tablets.patch b/0003-Add-an-ID-for-recognition-of-UGEE-tablets.patch
deleted file mode 100644
index cf77d5c..0000000
--- a/0003-Add-an-ID-for-recognition-of-UGEE-tablets.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d3506e73971e681c061edd3fb7c693ccd405c77c Mon Sep 17 00:00:00 2001
-From: Dmitry Kazakov <dimula73@gmail.com>
-Date: Sun, 10 Mar 2019 14:51:28 +0300
-Subject: [PATCH 3/3] Add an ID for recognition of UGEE tablets
-
-Change-Id: I2228ee9d53aa23a2d2cd9970a363d8424e744093
-Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
-Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
----
- src/plugins/platforms/xcb/qxcbconnection_xi2.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
-index e4da207b00..bc09fe2f91 100644
---- a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
-+++ b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
-@@ -240,6 +240,10 @@ void QXcbConnection::xi2SetupDevice(void *info, bool removeExisting)
-     } else if (name.contains("uc-logic") && isTablet) {
-         tabletData.pointerType = QTabletEvent::Pen;
-         dbgType = QLatin1String("pen");
-+    } else if (name.contains("ugee")) {
-+        isTablet = true;
-+        tabletData.pointerType = QTabletEvent::Pen;
-+        dbgType = QLatin1String("pen");
-     } else {
-         isTablet = false;
-     }
--- 
-2.21.0
-
diff --git a/0003-Make-sure-.pc-.prl-and-.la-files-are-created-for-hea.patch b/0003-Make-sure-.pc-.prl-and-.la-files-are-created-for-hea.patch
deleted file mode 100644
index 8049313..0000000
--- a/0003-Make-sure-.pc-.prl-and-.la-files-are-created-for-hea.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 4da47d0fba04e5d50bf6b63e73bc0de986560f42 Mon Sep 17 00:00:00 2001
-From: Joerg Bornemann <joerg.bornemann@qt.io>
-Date: Mon, 3 Jun 2019 14:59:16 +0200
-Subject: Make sure .pc, .prl and .la files are created for header_only modules
-
-Those modules are TEMPLATE=aux, so they weren't triggering the file creation
-here.
-
-To make this work properly we have to:
-  - check for TEMPLATE aux in the right places
-  - add a dummy target to INSTALLS to actually trigger the creation
-  - initialize PRL_TARGET for aux templates
-
-Fixes: QTBUG-75901
-Started-by: Thiago Macieira <thiago.macieira@intel.com>
-Change-Id: Idce141629dd34287808bfffd159f92ac28c6c8b1
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
----
- mkspecs/features/qt_module.prf      |  5 +++++
- qmake/generators/makefile.cpp       |  3 ++-
- qmake/generators/unix/unixmake.cpp  |  2 +-
- qmake/generators/unix/unixmake2.cpp | 10 +++++++---
- 4 files changed, 15 insertions(+), 5 deletions(-)
-
-diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index 51b5bde67a..18060cd490 100644
---- a/mkspecs/features/qt_module.prf
-+++ b/mkspecs/features/qt_module.prf
-@@ -82,6 +82,11 @@ header_module {
-     CONFIG      += force_qt  # Needed for the headers_clean tests.
-     !lib_bundle: \
-         CONFIG  += qt_no_install_library
-+
-+    # Allow creation of .prl, .la and .pc files.
-+    target.path = $$[QT_INSTALL_LIBS]
-+    target.CONFIG += dummy_install
-+    INSTALLS    += target
- } else {
-     TEMPLATE     = lib
- }
-diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 4a99a60892..caaf6e71b6 100644
---- a/qmake/generators/makefile.cpp
-+++ b/qmake/generators/makefile.cpp
-@@ -1120,7 +1120,8 @@ MakefileGenerator::writePrlFile()
-        && project->values("QMAKE_FAILED_REQUIREMENTS").isEmpty()
-        && project->isActiveConfig("create_prl")
-        && (project->first("TEMPLATE") == "lib"
--       || project->first("TEMPLATE") == "vclib")
-+       || project->first("TEMPLATE") == "vclib"
-+       || project->first("TEMPLATE") == "aux")
-        && (!project->isActiveConfig("plugin") || project->isActiveConfig("static"))) { //write prl file
-         QString local_prl = prlFileName();
-         QString prl = fileFixify(local_prl);
-diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
-index 7f42fbe09e..b809bb6c19 100644
---- a/qmake/generators/unix/unixmake.cpp
-+++ b/qmake/generators/unix/unixmake.cpp
-@@ -726,7 +726,7 @@ UnixMakefileGenerator::defaultInstall(const QString &t)
-             }
-         }
-     }
--    if(project->first("TEMPLATE") == "lib") {
-+    if (isAux || project->first("TEMPLATE") == "lib") {
-         QStringList types;
-         types << "prl" << "libtool" << "pkgconfig";
-         for(int i = 0; i < types.size(); ++i) {
-diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
-index 24215ae7b0..d9bcccf2e2 100644
---- a/qmake/generators/unix/unixmake2.cpp
-+++ b/qmake/generators/unix/unixmake2.cpp
-@@ -48,12 +48,15 @@ void
- UnixMakefileGenerator::writePrlFile(QTextStream &t)
- {
-     MakefileGenerator::writePrlFile(t);
-+    const ProString tmplt = project->first("TEMPLATE");
-+    if (tmplt != "lib" && tmplt != "aux")
-+        return;
-     // libtool support
--    if(project->isActiveConfig("create_libtool") && project->first("TEMPLATE") == "lib") { //write .la
-+    if (project->isActiveConfig("create_libtool")) {
-         writeLibtoolFile();
-     }
-     // pkg-config support
--    if(project->isActiveConfig("create_pc") && project->first("TEMPLATE") == "lib")
-+    if (project->isActiveConfig("create_pc"))
-         writePkgConfigFile();
- }
- 
-@@ -1199,7 +1202,8 @@ void UnixMakefileGenerator::init2()
-         project->values("QMAKE_FRAMEWORK_VERSION").append(project->first("VER_MAJ"));
- 
-     if (project->first("TEMPLATE") == "aux") {
--        // nothing
-+        project->values("PRL_TARGET") =
-+            project->values("TARGET").first().prepend(project->first("QMAKE_PREFIX_STATICLIB"));
-     } else if (!project->values("QMAKE_APP_FLAG").isEmpty()) {
-         if(!project->isEmpty("QMAKE_BUNDLE")) {
-             ProString bundle_loc = project->first("QMAKE_BUNDLE_LOCATION");
--- 
-cgit v1.2.1
-
diff --git a/0003-Revert-Fix-prl-replacements-if-libdir-is-in-QMAKE_DE.patch b/0003-Revert-Fix-prl-replacements-if-libdir-is-in-QMAKE_DE.patch
deleted file mode 100644
index 17fcb73..0000000
--- a/0003-Revert-Fix-prl-replacements-if-libdir-is-in-QMAKE_DE.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From debbdd25835318dc4848488da4dc0acfd27b3332 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Thu, 6 Jun 2019 20:06:08 +0200
-Subject: [PATCH 3/3] Revert "Fix prl replacements if libdir is in
- QMAKE_DEFAULT_LIBDIRS"
-
-This reverts commit d5071a4016ec663f8ec7c89ec7ebabea54b3260f.
----
- mkspecs/features/qt_common.prf | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
-index e51aa4766b..843916b3b1 100644
---- a/mkspecs/features/qt_common.prf
-+++ b/mkspecs/features/qt_common.prf
-@@ -39,10 +39,6 @@ contains(TEMPLATE, .*lib) {
-         qt_libdir = $$[QT_INSTALL_LIBS]
-     }
-     contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) {
--        lib_replace0.match = $$rplbase/lib/
--        lib_replace0.replace = $$qqt_libdir/
--        lib_replace0.CONFIG = path
--        QMAKE_PRL_INSTALL_REPLACE += lib_replace0
-         lib_replace.match = "[^ ']*$$rplbase/lib"
-         lib_replace.replace =
-     } else {
--- 
-2.21.0
-
diff --git a/libqt5-qtbase.changes b/libqt5-qtbase.changes
index 37bdf91..2636944 100644
--- a/libqt5-qtbase.changes
+++ b/libqt5-qtbase.changes
@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Fri Sep  6 08:03:13 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 5.13.1:
+  * New bugfix release
+  * For more details please see:
+  * http://code.qt.io/cgit/qt/qtbase.git/plain/dist/changes-5.13.1/?h=v5.13.1
+- Refresh patches:
+  * 0002-xcb-Use-the-screen-s-physical-DPI-as-logical-DPI-unl.patch
+- Drop patches, now upstream:
+  * 0001-Decrease-focusInTimer-timer-from-400-to-200.patch
+  * 0003-Add-an-ID-for-recognition-of-UGEE-tablets.patch
+  * 0001-Fix-crash-with-drag-cursor-handling.patch
+  * 0001-Fix-meta-file-replacements-if-matches-are-empty.patch
+  * 0002-Do-not-write-Libs-into-.pc-files-if-TEMPLATE-is-not-.patch
+  * 0003-Make-sure-.pc-.prl-and-.la-files-are-created-for-hea.patch
+- Replace reverts with upstream fix:
+  * D 0001-Revert-Fix-QMAKE_PRL_INSTALL_REPLACE-for-macOS.patch
+  * D 0001-Revert-qmake-link-qt-libraries-by-full-path.patch
+  * D 0002-Revert-Replace-absolute-Qt-lib-dir-in-.prl-files.patch
+  * D 0003-Revert-Fix-prl-replacements-if-libdir-is-in-QMAKE_DE.patch
+  * A 0001-Fix-CMake-config-files-for-libdir-different-from-lib.patch
+
 -------------------------------------------------------------------
 Mon Sep  2 08:26:30 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
 
diff --git a/libqt5-qtbase.spec b/libqt5-qtbase.spec
index 85e9059..9efbef5 100644
--- a/libqt5-qtbase.spec
+++ b/libqt5-qtbase.spec
@@ -36,16 +36,16 @@
 %endif
 
 Name:           libqt5-qtbase
-Version:        5.13.0
+Version:        5.13.1
 Release:        0
 Summary:        C++ Program Library, Core Components
 License:        LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only
 Group:          System/Libraries
 Url:            https://www.qt.io
 %define base_name libqt5
-%define real_version 5.13.0
-%define so_version 5.13.0
-%define tar_version qtbase-everywhere-src-5.13.0
+%define real_version 5.13.1
+%define so_version 5.13.1
+%define tar_version qtbase-everywhere-src-5.13.1
 Source:         https://download.qt.io/official_releases/qt/5.13/%{real_version}/submodules/%{tar_version}.tar.xz
 # to get mtime of file:
 Source1:        libqt5-qtbase.changes
@@ -76,26 +76,13 @@ Patch23:        0003-Revert-White-list-more-recent-Mesa-version-for-multi.patch
 Patch24:        fix-fixqt4headers.patch
 # Revert to restore compatibility with akonadi and possibly other applications
 Patch30:        0001-Revert-Always-escape-the-table-names-when-creating-t.patch
-# Reverting some commits in the hope to avoid QTBUG-76255
-Patch50:        0001-Revert-Fix-QMAKE_PRL_INSTALL_REPLACE-for-macOS.patch
-Patch51:        0002-Revert-Replace-absolute-Qt-lib-dir-in-.prl-files.patch
-Patch52:        0003-Revert-Fix-prl-replacements-if-libdir-is-in-QMAKE_DE.patch
-Patch53:        0001-Revert-qmake-link-qt-libraries-by-full-path.patch
-# Workaround for QTBUG-76742, boo#1140084
-Patch60:        0001-Decrease-focusInTimer-timer-from-400-to-200.patch
 # patches 1000-2000 and above from upstream 5.13 branch #
-Patch1000:      0003-Add-an-ID-for-recognition-of-UGEE-tablets.patch
-Patch1001:      0001-Fix-crash-with-drag-cursor-handling.patch
 # patches 2000-3000 and above from upstream 5.14/dev branch #
 Patch2000:      0001-Fix-notification-of-QDockWidget-when-it-gets-undocke.patch
 # Not accepted yet, https://codereview.qt-project.org/c/qt/qtbase/+/255384
 Patch2001:      0002-Synthesize-Enter-LeaveEvent-for-accepted-QTabletEven.patch
-# PATCH-FIX-UPSTREAM https://code.qt.io/cgit/qt/qtbase.git/patch/?id=60136b1a846ca5aedeb588edaa178927abb002ec -- https://bugreports.qt.io/browse/QTBUG-75901
-PATCH3000:      0001-Fix-meta-file-replacements-if-matches-are-empty.patch
-# PATCH-FIX-UPSTREAM https://code.qt.io/cgit/qt/qtbase.git/patch/?id=c64f8ca232cc1f2131282d9eb6279ef9b565be88 -- https://bugreports.qt.io/browse/QTBUG-75901
-PATCH3001:      0002-Do-not-write-Libs-into-.pc-files-if-TEMPLATE-is-not-.patch
-# PATCH-FIX-UPSTREAM https://code.qt.io/cgit/qt/qtbase.git/patch/?id=4da47d0fba04e5d50bf6b63e73bc0de986560f42 -- https://bugreports.qt.io/browse/QTBUG-75901
-PATCH3002:      0003-Make-sure-.pc-.prl-and-.la-files-are-created-for-hea.patch
+# Not accepted yet, https://codereview.qt-project.org/c/qt/qtbase/+/273050
+Patch2002:      0001-Fix-CMake-config-files-for-libdir-different-from-lib.patch
 BuildRequires:  alsa-devel
 BuildRequires:  cups-devel
 BuildRequires:  double-conversion-devel
@@ -1247,10 +1234,13 @@ chmod 644 %{buildroot}%{libqt5_docdir}/global/template/images/*.png
 %{libqt5_libdir}/libQt5Gui.prl
 %{libqt5_libdir}/libQt5EglFSDeviceIntegration.so
 %{libqt5_libdir}/libQt5EglFSDeviceIntegration.prl
+%{libqt5_libdir}/cmake/Qt5EglFSDeviceIntegration/
 %{libqt5_libdir}/libQt5EglFsKmsSupport.prl
 %{libqt5_libdir}/libQt5EglFsKmsSupport.so
+%{libqt5_libdir}/cmake/Qt5EglFsKmsSupport/
 %{libqt5_libdir}/libQt5XcbQpa.so
 %{libqt5_libdir}/libQt5XcbQpa.prl
+%{libqt5_libdir}/cmake/Qt5XcbQpa/
 %{libqt5_libdir}/cmake/Qt5Gui/
 %{libqt5_libdir}/pkgconfig/Qt5Gui.pc
 %{libqt5_includedir}/QtGui/
@@ -1309,7 +1299,7 @@ chmod 644 %{buildroot}%{libqt5_docdir}/global/template/images/*.png
 %doc *.txt
 %{libqt5_libdir}/libQt5Bootstrap.a
 %{libqt5_libdir}/libQt5Bootstrap.prl
-#{libqt5_libdir}/pkgconfig/Qt5Bootstrap.pc
+%{libqt5_libdir}/cmake/Qt5Bootstrap/
 
 %files -n libQt5OpenGLExtensions-devel-static
 %license LICENSE.*
@@ -1325,37 +1315,52 @@ chmod 644 %{buildroot}%{libqt5_docdir}/global/template/images/*.png
 %doc *.txt
 %{libqt5_libdir}/libQt5XkbCommonSupport.a
 %{libqt5_libdir}/libQt5XkbCommonSupport.prl
+%{libqt5_libdir}/cmake/Qt5XkbCommonSupport/
 %{libqt5_libdir}/libQt5AccessibilitySupport.a
 %{libqt5_libdir}/libQt5AccessibilitySupport.prl
+%{libqt5_libdir}/cmake/Qt5AccessibilitySupport/
 %{libqt5_libdir}/libQt5DeviceDiscoverySupport.a
 %{libqt5_libdir}/libQt5DeviceDiscoverySupport.prl
+%{libqt5_libdir}/cmake/Qt5DeviceDiscoverySupport/
 %{libqt5_libdir}/libQt5EglSupport.a
 %{libqt5_libdir}/libQt5EglSupport.prl
+%{libqt5_libdir}/cmake/Qt5EglSupport/
 %{libqt5_libdir}/libQt5EventDispatcherSupport.a
 %{libqt5_libdir}/libQt5EventDispatcherSupport.prl
+%{libqt5_libdir}/cmake/Qt5EventDispatcherSupport/
 %{libqt5_libdir}/libQt5FbSupport.a
 %{libqt5_libdir}/libQt5FbSupport.prl
+%{libqt5_libdir}/cmake/Qt5FbSupport/
 %{libqt5_libdir}/libQt5FontDatabaseSupport.a
 %{libqt5_libdir}/libQt5FontDatabaseSupport.prl
+%{libqt5_libdir}/cmake/Qt5FontDatabaseSupport/
 %ifnarch %arm aarch64
 %{libqt5_libdir}/libQt5GlxSupport.a
 %{libqt5_libdir}/libQt5GlxSupport.prl
+%{libqt5_libdir}/cmake/Qt5GlxSupport/
 %endif
 %{libqt5_libdir}/libQt5InputSupport.a
 %{libqt5_libdir}/libQt5InputSupport.prl
+%{libqt5_libdir}/cmake/Qt5InputSupport/
 %{libqt5_libdir}/libQt5LinuxAccessibilitySupport.a
 %{libqt5_libdir}/libQt5LinuxAccessibilitySupport.prl
+%{libqt5_libdir}/cmake/Qt5LinuxAccessibilitySupport/
 %{libqt5_libdir}/libQt5PlatformCompositorSupport.a
 %{libqt5_libdir}/libQt5PlatformCompositorSupport.prl
+%{libqt5_libdir}/cmake/Qt5PlatformCompositorSupport/
 %{libqt5_libdir}/libQt5ServiceSupport.a
 %{libqt5_libdir}/libQt5ServiceSupport.prl
+%{libqt5_libdir}/cmake/Qt5ServiceSupport/
 %{libqt5_libdir}/libQt5ThemeSupport.a
 %{libqt5_libdir}/libQt5ThemeSupport.prl
+%{libqt5_libdir}/cmake/Qt5ThemeSupport/
 %{libqt5_libdir}/libQt5EdidSupport.a
 %{libqt5_libdir}/libQt5EdidSupport.prl
+%{libqt5_libdir}/cmake/Qt5EdidSupport/
 %if %{vulkan}
 %{libqt5_libdir}/libQt5VulkanSupport.a
 %{libqt5_libdir}/libQt5VulkanSupport.prl
+%{libqt5_libdir}/cmake/Qt5VulkanSupport/
 %endif
 %{libqt5_includedir}/QtAccessibilitySupport/
 %{libqt5_includedir}/QtDeviceDiscoverySupport/
@@ -1399,6 +1404,7 @@ chmod 644 %{buildroot}%{libqt5_docdir}/global/template/images/*.png
 %doc *.txt
 %{libqt5_libdir}/libQt5KmsSupport.a
 %{libqt5_libdir}/libQt5KmsSupport.prl
+%{libqt5_libdir}/cmake/Qt5KmsSupport/
 %exclude %{libqt5_includedir}/QtKmsSupport/%{so_version}/
 %{libqt5_includedir}/QtKmsSupport/
 
diff --git a/qtbase-everywhere-src-5.13.0.tar.xz b/qtbase-everywhere-src-5.13.0.tar.xz
deleted file mode 100644
index 7e126a3..0000000
--- a/qtbase-everywhere-src-5.13.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ff6964b3b528cd3b1d21bcf3470006e8e5cbe69591923f982871d886ea0488fe
-size 48640652
diff --git a/qtbase-everywhere-src-5.13.1.tar.xz b/qtbase-everywhere-src-5.13.1.tar.xz
new file mode 100644
index 0000000..0579a1f
--- /dev/null
+++ b/qtbase-everywhere-src-5.13.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:110cd08cdacab26274bf2519d3508046616c0b638f0d2f5e00bc8bad87469eab
+size 48807960