qt6 new package

2022-10-08 21:29:58 +03:00
parent fce9a4cecb
commit 136b1ff12e
140 changed files with 13061 additions and 38 deletions
@@ -0,0 +1,32 @@
+diff --git a/cmake/FindInterbase.cmake b/cmake/FindInterbase.cmake
+index 22f866d8..4ef16e75 100644
+--- a/cmake/FindInterbase.cmake
+++ b/cmake/FindInterbase.cmake
+@@ -19,12 +19,12 @@
+ #     The Interbase client library
+
+ find_path(Interbase_INCLUDE_DIR
+-          NAMES ibase.h
+          NAMES firebird/ibase.h
+           HINTS ${Interbase_INCLUDEDIR}
+ )
+
+ find_library(Interbase_LIBRARY
+-             NAMES firebase_ms fbclient gds
+             NAMES firebase_ms fbclient gds fbclient
+              HINTS ${Interbase_LIBDIR}
+ )
+
+diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase_p.h b/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
+index 9109c2b4..7477d5ee 100644
+--- a/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
+++ b/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
+@@ -52,7 +52,7 @@
+ //
+ 
+ #include <QtSql/qsqldriver.h>
+-#include <ibase.h>
+#include <firebird/ibase.h>
+ 
+ #ifdef QT_PLUGIN
+ #define Q_EXPORT_SQLDRIVER_IBASE
@@ -0,0 +1,36 @@
+diff --git a/examples/corelib/tools/contiguouscache/randomlistmodel.h b/examples/corelib/tools/contiguouscache/randomlistmodel.h
+index 1fabb0d9..393ebaa3 100644
+--- a/examples/corelib/tools/contiguouscache/randomlistmodel.h
+++ b/examples/corelib/tools/contiguouscache/randomlistmodel.h
+@@ -50,6 +50,7 @@
+ #ifndef RANDOMLISTMODEL_H
+ #define RANDOMLISTMODEL_H
+ 
+#include <limits>
+ #include <QContiguousCache>
+ #include <QAbstractListModel>
+ 
+diff --git a/src/corelib/text/qanystringview.h b/src/corelib/text/qanystringview.h
+index a7606253..60747cf0 100644
+--- a/src/corelib/text/qanystringview.h
+++ b/src/corelib/text/qanystringview.h
+@@ -39,6 +39,7 @@
+ #ifndef QANYSTRINGVIEW_H
+ #define QANYSTRINGVIEW_H
+ 
+#include <limits>
+ #include <QtCore/qstringview.h>
+ #include <QtCore/qutf8stringview.h>
+ 
+diff --git a/src/corelib/text/qbytearray.h b/src/corelib/text/qbytearray.h
+index 9f646aaa..a5af793c 100644
+--- a/src/corelib/text/qbytearray.h
+++ b/src/corelib/text/qbytearray.h
+@@ -41,6 +41,7 @@
+ #ifndef QBYTEARRAY_H
+ #define QBYTEARRAY_H
+ 
+#include <limits>
+ #include <QtCore/qrefcount.h>
+ #include <QtCore/qnamespace.h>
+ #include <QtCore/qarraydata.h>
@@ -0,0 +1,16 @@
+diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
+index 0bf250ea..2d1bb645 100644
+--- a/src/gui/configure.cmake
+++ b/src/gui/configure.cmake
+@@ -174,9 +174,9 @@ qt_config_compile_test(egl_x11
+ int main(void)
+ {
+     /* BEGIN TEST: */
+-Display *dpy = EGL_DEFAULT_DISPLAY;
+Display *dpy = reinterpret_cast<Display *>(EGL_DEFAULT_DISPLAY);
+ EGLNativeDisplayType egldpy = XOpenDisplay(\"\");
+-dpy = egldpy;
+dpy = reinterpret_cast<Display *>(egldpy);
+ EGLNativeWindowType w = XCreateWindow(dpy, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+ XDestroyWindow(dpy, w);
+ XCloseDisplay(dpy);
@@ -0,0 +1,16 @@
+diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp
+index 1cb383c9..6bfdee55 100644
+--- a/src/tools/moc/main.cpp
+++ b/src/tools/moc/main.cpp
+@@ -230,6 +230,11 @@ int runMoc(int argc, char **argv)
+     Moc moc;
+     pp.macros["Q_MOC_RUN"];
+     pp.macros["__cplusplus"];
+    pp.macros["_SYS_SYSMACROS_H_OUTER"];
+    Macro macro;
+    macro.symbols = Preprocessor::tokenize(QByteArray::number(Q_PROCESSOR_WORDSIZE*8), 1, Preprocessor::TokenizeDefine);
+    macro.symbols.removeLast(); // remove the EOF symbol
+    pp.macros.insert("__WORDSIZE", macro);
+ 
+     // Don't stumble over GCC extensions
+     Macro dummyVariadicFunctionMacro;
@@ -0,0 +1,12 @@
+diff -up qtbase-opensource-src-5.9.0/src/plugins/sqldrivers/mysql/qsql_mysql.cpp.than qtbase-opensource-src-5.9.0/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
+diff -up qtbase-opensource-src-5.9.0/src/plugins/sqldrivers/mysql/qsql_mysql_p.h.than qtbase-opensource-src-5.9.0/src/plugins/sqldrivers/mysql/qsql_mysql_p.h
+--- qtbase-opensource-src-5.9.0/src/plugins/sqldrivers/mysql/qsql_mysql_p.h.than	2017-07-14 13:43:50.831203768 +0200
+++ qtbase-opensource-src-5.9.0/src/plugins/sqldrivers/mysql/qsql_mysql_p.h	2017-07-14 13:44:24.364948006 +0200
+@@ -58,6 +58,7 @@
+ #endif
+ 
+ #include <mysql.h>
+#include <mysql_version.h>
+ 
+ #ifdef QT_PLUGIN
+ #define Q_EXPORT_SQLDRIVER_MYSQL
@@ -0,0 +1,16 @@
+diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
+index 3cacc8df..469e6f50 100644
+--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
+@@ -218,9 +218,9 @@ android: CONFIG += qt_android_deps no_linker_version_script
+     QMAKE_LFLAGS += $${QMAKE_LFLAGS_VERSION_SCRIPT}$$verscript
+ 
+     internal_module {
+-        verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API { *; };"
+        verscript_content = "Qt_$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}_PRIVATE_API { *; };"
+     } else {
+-        verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API {" \
+        verscript_content = "Qt_$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}_PRIVATE_API {" \
+                             "    qt_private_api_tag*;"
+ 
+         private_api_headers = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.QPA_HEADER_FILES
@@ -0,0 +1,13 @@
+diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
+index 6e83b78f..6a18cc19 100644
+--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
+@@ -59,7 +59,7 @@
+ /*
+    can be used like #if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0))
+ */
+-#define QT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
+#define QT_VERSION_CHECK(qt_version_check_major, qt_version_check_minor, qt_version_check_patch) ((qt_version_check_major<<16)|(qt_version_check_minor<<8)|(qt_version_check_patch))
+ 
+ #ifdef QT_BOOTSTRAPPED
+ #include <QtCore/qconfig-bootstrapped.h>
@@ -0,0 +1,47 @@
+diff -Nuar a/mkspecs/common/g++-base.conf b/mkspecs/common/g++-base.conf
+--- a/mkspecs/common/g++-base.conf	2021-11-15 00:00:01.000000000 +0200
+++ b/mkspecs/common/g++-base.conf	2021-11-15 22:49:20.969099951 +0200
+@@ -10,15 +10,17 @@
+ 
+ QMAKE_COMPILER          = gcc
+ 
+-QMAKE_CC                = $${CROSS_COMPILE}gcc
+QMAKE_CC                = PISILINUX_CC
+ 
+-QMAKE_LINK_C            = $$QMAKE_CC
+-QMAKE_LINK_C_SHLIB      = $$QMAKE_CC
+QMAKE_LINK_C            = PISILINUX_CC
+QMAKE_LINK_C_SHLIB      = PISILINUX_CC
+ 
+-QMAKE_CXX               = $${CROSS_COMPILE}g++
+QMAKE_CXX               = PISILINUX_CXX
+ 
+-QMAKE_LINK              = $$QMAKE_CXX
+-QMAKE_LINK_SHLIB        = $$QMAKE_CXX
+QMAKE_LINK              = PISILINUX_CXX
+QMAKE_LINK_SHLIB        = PISILINUX_CXX
+
+QMAKE_LFLAGS_RELEASE    += PISILINUX_LDFLAGS
+ 
+ QMAKE_PCH_OUTPUT_EXT    = .gch
+ 
+diff -Nuar a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
+--- a/mkspecs/common/g++-unix.conf	2021-11-15 00:00:01.000000000 +0200
+++ b/mkspecs/common/g++-unix.conf	2021-11-15 22:51:51.058450056 +0200
+@@ -10,5 +10,5 @@
+ 
+ include(g++-base.conf)
+ 
+-QMAKE_LFLAGS_RELEASE   += -Wl,-O1
+QMAKE_LFLAGS_RELEASE   += PISILINUX_LDFLAGS
+ QMAKE_LFLAGS_NOUNDEF   += -Wl,--no-undefined
+diff -Nuar a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
+--- a/mkspecs/common/linux.conf	2021-11-15 00:00:01.000000000 +0200
+++ b/mkspecs/common/linux.conf	2021-11-15 22:52:35.802019704 +0200
+@@ -48,5 +48,5 @@
+ QMAKE_NM                = nm -P
+ QMAKE_RANLIB            =
+ 
+-QMAKE_STRIP             = strip
+QMAKE_STRIP             =
+ QMAKE_STRIPFLAGS_LIB   += --strip-unneeded
@@ -0,0 +1,13 @@
+diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
+index 99d77156fd..fc840fe9f6 100644
+--- a/mkspecs/common/gcc-base.conf
+++ b/mkspecs/common/gcc-base.conf
+@@ -31,6 +31,8 @@
+ # you can use the manual test in tests/manual/mkspecs.
+ #
+ 
+CONFIG += nostrip
+
+ QMAKE_CFLAGS_OPTIMIZE      = -O2
+ QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
+ QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og