guibuilder_pel7x64builder0
5 years ago
15 changed files with 812 additions and 248 deletions
@ -0,0 +1,33 @@
@@ -0,0 +1,33 @@
|
||||
From 2e02b383e03c30f53ff613e431e8fe1d063d5502 Mon Sep 17 00:00:00 2001 |
||||
From: Olivier Goffart <ogoffart@woboq.com> |
||||
Date: Fri, 8 Nov 2019 11:30:40 +0100 |
||||
Subject: [PATCH] Do not load plugin from the $PWD |
||||
|
||||
I see no reason why this would make sense to look for plugins in the current |
||||
directory. And when there are plugins there, it may actually be wrong |
||||
|
||||
Change-Id: I5f5aa168021fedddafce90effde0d5762cd0c4c5 |
||||
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> |
||||
(cherry picked from commit bf131e8d2181b3404f5293546ed390999f760404) |
||||
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> |
||||
(cherry picked from commit 52b739776daecf80a8276b49c9e4337e018d8e8b) |
||||
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> |
||||
--- |
||||
src/corelib/plugin/qpluginloader.cpp | 1 - |
||||
1 file changed, 1 deletion(-) |
||||
|
||||
diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp |
||||
index aab00cc7eb..15b8654391 100644 |
||||
--- a/src/corelib/plugin/qpluginloader.cpp |
||||
+++ b/src/corelib/plugin/qpluginloader.cpp |
||||
@@ -304,7 +304,6 @@ static QString locatePlugin(const QString& fileName) |
||||
paths.append(fileName.left(slash)); // don't include the '/' |
||||
} else { |
||||
paths = QCoreApplication::libraryPaths(); |
||||
- paths.prepend(QStringLiteral(".")); // search in current dir first |
||||
} |
||||
|
||||
for (const QString &path : qAsConst(paths)) { |
||||
-- |
||||
2.24.1 |
||||
|
@ -0,0 +1,21 @@
@@ -0,0 +1,21 @@
|
||||
diff -up qtbase-everywhere-src-5.13.2/src/corelib/plugin/qlibrary_unix.cpp.QLibrary-Unix-do-not-attempt-to-load-a-library-relat qtbase-everywhere-src-5.13.2/src/corelib/plugin/qlibrary_unix.cpp |
||||
--- qtbase-everywhere-src-5.13.2/src/corelib/plugin/qlibrary_unix.cpp.QLibrary-Unix-do-not-attempt-to-load-a-library-relat 2019-10-25 09:16:48.000000000 +0200 |
||||
+++ qtbase-everywhere-src-5.13.2/src/corelib/plugin/qlibrary_unix.cpp 2020-01-20 10:49:23.619299927 +0100 |
||||
@@ -1,7 +1,7 @@ |
||||
/**************************************************************************** |
||||
** |
||||
** Copyright (C) 2016 The Qt Company Ltd. |
||||
-** Copyright (C) 2018 Intel Corporation |
||||
+** Copyright (C) 2020 Intel Corporation |
||||
** Contact: https://www.qt.io/licensing/ |
||||
** |
||||
** This file is part of the QtCore module of the Qt Toolkit. |
||||
@@ -208,6 +208,8 @@ bool QLibraryPrivate::load_sys() |
||||
for(int suffix = 0; retry && !pHnd && suffix < suffixes.size(); suffix++) { |
||||
if (!prefixes.at(prefix).isEmpty() && name.startsWith(prefixes.at(prefix))) |
||||
continue; |
||||
+ if (path.isEmpty() && prefixes.at(prefix).contains(QLatin1Char('/'))) |
||||
+ continue; |
||||
if (!suffixes.at(suffix).isEmpty() && name.endsWith(suffixes.at(suffix))) |
||||
continue; |
||||
if (loadHints & QLibrary::LoadArchiveMemberHint) { |
@ -0,0 +1,4 @@
@@ -0,0 +1,4 @@
|
||||
%_qt5 @@NAME@@ |
||||
%_qt5_epoch @@EPOCH@@ |
||||
%_qt5_version @@VERSION@@ |
||||
%_qt5_evr @@EVR@@ |
@ -0,0 +1,29 @@
@@ -0,0 +1,29 @@
|
||||
diff -up qtbase-everywhere-src-5.12.1/src/plugins/sqldrivers/configure.json.firebird qtbase-everywhere-src-5.12.1/src/plugins/sqldrivers/configure.json |
||||
--- qtbase-everywhere-src-5.12.1/src/plugins/sqldrivers/configure.json.firebird 2019-01-28 11:11:52.000000000 -0600 |
||||
+++ qtbase-everywhere-src-5.12.1/src/plugins/sqldrivers/configure.json 2019-02-03 13:41:27.392305128 -0600 |
||||
@@ -49,10 +49,11 @@ |
||||
"ibase": { |
||||
"label": "InterBase", |
||||
"test": {}, |
||||
- "headers": "ibase.h", |
||||
+ "headers": "firebird/ibase.h", |
||||
"sources": [ |
||||
{ "libs": "-lgds32_ms", "condition": "config.win32" }, |
||||
- { "libs": "-lgds", "condition": "!config.win32" } |
||||
+ { "libs": "-lgds", "condition": "!config.win32" }, |
||||
+ { "libs": "-lfbclient", "condition": "!config.win32" } |
||||
] |
||||
}, |
||||
"mysql": { |
||||
diff -up qtbase-everywhere-src-5.12.1/src/plugins/sqldrivers/ibase/qsql_ibase_p.h.firebird qtbase-everywhere-src-5.12.1/src/plugins/sqldrivers/ibase/qsql_ibase_p.h |
||||
--- qtbase-everywhere-src-5.12.1/src/plugins/sqldrivers/ibase/qsql_ibase_p.h.firebird 2019-01-28 11:11:52.000000000 -0600 |
||||
+++ qtbase-everywhere-src-5.12.1/src/plugins/sqldrivers/ibase/qsql_ibase_p.h 2019-02-03 13:27:30.683142996 -0600 |
||||
@@ -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,9 @@
@@ -0,0 +1,9 @@
|
||||
diff -up qtbase-everywhere-src-5.11.1/mkspecs/features/uikit/devices.py.me qtbase-everywhere-src-5.11.1/mkspecs/features/uikit/devices.py |
||||
--- qtbase-everywhere-src-5.11.1/mkspecs/features/uikit/devices.py.me 2018-06-23 11:29:21.750066271 +0200 |
||||
+++ qtbase-everywhere-src-5.11.1/mkspecs/features/uikit/devices.py 2018-06-23 11:30:07.457292033 +0200 |
||||
@@ -1,4 +1,4 @@ |
||||
-#!/usr/bin/python |
||||
+#!/usr/bin/python3 |
||||
|
||||
############################################################################# |
||||
## |
@ -0,0 +1,14 @@
@@ -0,0 +1,14 @@
|
||||
diff -up qtbase-everywhere-src-5.12.1/src/gui/Qt5GuiConfigExtras.cmake.in.foo qtbase-everywhere-src-5.12.1/src/gui/Qt5GuiConfigExtras.cmake.in |
||||
--- qtbase-everywhere-src-5.12.1/src/gui/Qt5GuiConfigExtras.cmake.in.foo 2019-04-30 15:18:24.886346423 -0500 |
||||
+++ qtbase-everywhere-src-5.12.1/src/gui/Qt5GuiConfigExtras.cmake.in 2019-04-30 15:19:48.303873296 -0500 |
||||
@@ -66,8 +66,10 @@ unset(_GL_INCDIRS) |
||||
# Don\'t check for existence of the "_qt5gui_OPENGL_INCLUDE_DIR" because it is |
||||
# optional. |
||||
|
||||
+if (NOT ${_qt5gui_OPENGL_INCLUDE_DIR} STREQUAL "/usr/include") |
||||
list(APPEND Qt5Gui_INCLUDE_DIRS ${_qt5gui_OPENGL_INCLUDE_DIR}) |
||||
set_property(TARGET Qt5::Gui APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${_qt5gui_OPENGL_INCLUDE_DIR}) |
||||
+endif() |
||||
|
||||
unset(_qt5gui_OPENGL_INCLUDE_DIR CACHE) |
||||
|
@ -1,13 +1,12 @@
@@ -1,13 +1,12 @@
|
||||
diff --git a/src/plugins/platforms/xcb/qxcbscreen.cpp b/src/plugins/platforms/xcb/qxcbscreen.cpp |
||||
index 5e136b5..0ad2842 100644 |
||||
--- a/src/plugins/platforms/xcb/qxcbscreen.cpp |
||||
+++ b/src/plugins/platforms/xcb/qxcbscreen.cpp |
||||
@@ -620,7 +620,7 @@ void QXcbScreen::updateGeometry(const QRect &geom, uint8_t rotation) |
||||
m_sizeMillimeters = sizeInMillimeters(xGeometry.size(), virtualDpi()); |
||||
|
||||
qreal dpi = xGeometry.width() / physicalSize().width() * qreal(25.4); |
||||
- m_pixelDensity = qMax(1, qRound(dpi/96)); |
||||
+ m_pixelDensity = qMax(1, (int) (dpi/96)); // instead of rounding at 1.5, round at 2.0 (same as GNOME) |
||||
m_geometry = QRect(xGeometry.topLeft(), xGeometry.size()); |
||||
m_availableGeometry = xGeometry & m_virtualDesktop->workArea(); |
||||
diff -up qtbase-everywhere-src-5.12.1/src/plugins/platforms/xcb/qxcbscreen.cpp.hidpi_scale_at_192 qtbase-everywhere-src-5.12.1/src/plugins/platforms/xcb/qxcbscreen.cpp |
||||
--- qtbase-everywhere-src-5.12.1/src/plugins/platforms/xcb/qxcbscreen.cpp.hidpi_scale_at_192 2019-02-03 13:21:27.866906481 -0600 |
||||
+++ qtbase-everywhere-src-5.12.1/src/plugins/platforms/xcb/qxcbscreen.cpp 2019-02-03 13:23:47.554767565 -0600 |
||||
@@ -744,7 +744,7 @@ void QXcbScreen::updateGeometry(const QR |
||||
// Use 128 as a reference DPI on small screens. This favors "small UI" over "large UI". |
||||
qreal referenceDpi = physicalSize().width() <= 320 ? 128 : 96; |
||||
|
||||
- m_pixelDensity = qMax(1, qRound(dpi/referenceDpi)); |
||||
+ m_pixelDensity = qMax(1, (int) (dpi/referenceDpi)); //instead of rounding at 1.5, round at 2.0 (same as GNOME) |
||||
m_geometry = geometry; |
||||
m_availableGeometry = geometry & m_virtualDesktop->workArea(); |
||||
QWindowSystemInterface::handleScreenGeometryChange(QPlatformScreen::screen(), m_geometry, m_availableGeometry); |
||||
|
@ -0,0 +1,13 @@
@@ -0,0 +1,13 @@
|
||||
diff -up qtbase-opensource-src-5.3.2/src/xml/sax/qxml.cpp.QTBUG-35459 qtbase-opensource-src-5.3.2/src/xml/sax/qxml.cpp |
||||
diff -up qtbase-opensource-src-5.3.2/src/xml/sax/qxml_p.h.QTBUG-35459 qtbase-opensource-src-5.3.2/src/xml/sax/qxml_p.h |
||||
--- qtbase-opensource-src-5.3.2/src/xml/sax/qxml_p.h.QTBUG-35459 2014-09-11 05:48:05.000000000 -0500 |
||||
+++ qtbase-opensource-src-5.3.2/src/xml/sax/qxml_p.h 2014-09-16 09:35:01.189255615 -0500 |
||||
@@ -223,7 +223,7 @@ private: |
||||
// for the DTD currently being parsed. |
||||
static const int dtdRecursionLimit = 2; |
||||
// The maximum amount of characters an entity value may contain, after expansion. |
||||
- static const int entityCharacterLimit = 1024; |
||||
+ static const int entityCharacterLimit = 4096; |
||||
|
||||
const QString &string(); |
||||
void stringClear(); |
@ -0,0 +1,12 @@
@@ -0,0 +1,12 @@
|
||||
diff -up qtbase-everywhere-src-5.10.1/qmake/Makefile.unix.qmake_LFLAGS qtbase-everywhere-src-5.10.1/qmake/Makefile.unix |
||||
--- qtbase-everywhere-src-5.10.1/qmake/Makefile.unix.qmake_LFLAGS 2018-02-08 12:24:48.000000000 -0600 |
||||
+++ qtbase-everywhere-src-5.10.1/qmake/Makefile.unix 2018-02-15 10:25:07.077763061 -0600 |
||||
@@ -142,7 +142,7 @@ CPPFLAGS = -g $(EXTRA_CPPFLAGS) \ |
||||
-DQT_NO_FOREACH |
||||
|
||||
CXXFLAGS = $(EXTRA_CXXFLAGS) $(CONFIG_CXXFLAGS) $(CPPFLAGS) |
||||
-LFLAGS = $(EXTRA_LFLAGS) $(CONFIG_LFLAGS) |
||||
+LFLAGS = $(EXTRA_LFLAGS) $(CONFIG_LFLAGS) $(QMAKE_LFLAGS_RELEASE) |
||||
|
||||
first all: $(BUILD_PATH)/bin/qmake$(EXEEXT) |
||||
qmake: $(BUILD_PATH)/bin/qmake$(EXEEXT) |
@ -0,0 +1,20 @@
@@ -0,0 +1,20 @@
|
||||
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp |
||||
index b8bfad4f16..676fdfad5e 100644 |
||||
--- a/src/gui/kernel/qguiapplication.cpp |
||||
+++ b/src/gui/kernel/qguiapplication.cpp |
||||
@@ -1376,14 +1376,7 @@ void QGuiApplicationPrivate::createPlatformIntegration() |
||||
if (sessionType == QByteArrayLiteral("x11") && !platformName.contains(QByteArrayLiteral("xcb"))) { |
||||
platformName = QByteArrayLiteral("xcb"); |
||||
} else if (sessionType == QByteArrayLiteral("wayland") && !platformName.contains(QByteArrayLiteral("wayland"))) { |
||||
- QByteArray currentDesktop = qgetenv("XDG_CURRENT_DESKTOP").toLower(); |
||||
- QByteArray sessionDesktop = qgetenv("XDG_SESSION_DESKTOP").toLower(); |
||||
- if (currentDesktop.contains("gnome") || sessionDesktop.contains("gnome")) { |
||||
- qInfo() << "Warning: Ignoring XDG_SESSION_TYPE=wayland on Gnome." |
||||
- << "Use QT_QPA_PLATFORM=wayland to run on Wayland anyway."; |
||||
- } else { |
||||
- platformName = QByteArrayLiteral("wayland"); |
||||
- } |
||||
+ platformName = QByteArrayLiteral("wayland"); |
||||
} |
||||
} |
||||
#ifdef QT_QPA_DEFAULT_PLATFORM_NAME |
@ -1,2 +1,3 @@
@@ -1,2 +1,3 @@
|
||||
[Rules] |
||||
*.debug=false |
||||
qt.qpa.xcb.xcberror.warning=false |
||||
|
@ -0,0 +1,16 @@
@@ -0,0 +1,16 @@
|
||||
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf |
||||
index e6a0d97..cf93041 100644 |
||||
--- a/mkspecs/features/qt_module.prf |
||||
+++ b/mkspecs/features/qt_module.prf |
||||
@@ -216,9 +216,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,41 @@
@@ -0,0 +1,41 @@
|
||||
From 911762e077c8b2f9795171c1e628942a0a979801 Mon Sep 17 00:00:00 2001 |
||||
From: Jan Grulich <jgrulich@redhat.com> |
||||
Date: Fri, 15 Dec 2017 11:56:12 +0100 |
||||
Subject: foo |
||||
|
||||
|
||||
diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp |
||||
index 536c709..c6eb1b1 100644 |
||||
--- a/src/plugins/platforms/xcb/qxcbconnection.cpp |
||||
+++ b/src/plugins/platforms/xcb/qxcbconnection.cpp |
||||
@@ -111,6 +111,8 @@ Q_LOGGING_CATEGORY(lcQpaXInputEvents, "qt.qpa.input.events") |
||||
Q_LOGGING_CATEGORY(lcQpaScreen, "qt.qpa.screen") |
||||
Q_LOGGING_CATEGORY(lcQpaEvents, "qt.qpa.events") |
||||
Q_LOGGING_CATEGORY(lcQpaXcb, "qt.qpa.xcb") // for general (uncategorized) XCB logging |
||||
+Q_LOGGING_CATEGORY(lcQpaXcbError, "qt.qpa.xcb.xcberror") |
||||
+// TODO: How to categorize by xcberror type? (e.g. only BadWindow) |
||||
Q_LOGGING_CATEGORY(lcQpaPeeker, "qt.qpa.peeker") |
||||
|
||||
// this event type was added in libxcb 1.10, |
||||
@@ -964,7 +966,8 @@ void QXcbConnection::handleXcbError(xcb_generic_error_t *error) |
||||
uint clamped_error_code = qMin<uint>(error->error_code, (sizeof(xcb_errors) / sizeof(xcb_errors[0])) - 1); |
||||
uint clamped_major_code = qMin<uint>(error->major_code, (sizeof(xcb_protocol_request_codes) / sizeof(xcb_protocol_request_codes[0])) - 1); |
||||
|
||||
- qWarning("QXcbConnection: XCB error: %d (%s), sequence: %d, resource id: %d, major code: %d (%s), minor code: %d", |
||||
+ qCWarning(lcQpaXcbError, |
||||
+ "QXcbConnection: XCB error: %d (%s), sequence: %d, resource id: %d, major code: %d (%s), minor code: %d", |
||||
int(error->error_code), xcb_errors[clamped_error_code], |
||||
int(error->sequence), int(error->resource_id), |
||||
int(error->major_code), xcb_protocol_request_codes[clamped_major_code], |
||||
diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h |
||||
index 999dc06..554611c 100644 |
||||
--- a/src/plugins/platforms/xcb/qxcbconnection.h |
||||
+++ b/src/plugins/platforms/xcb/qxcbconnection.h |
||||
@@ -91,6 +91,7 @@ Q_DECLARE_LOGGING_CATEGORY(lcQpaXInputEvents) |
||||
Q_DECLARE_LOGGING_CATEGORY(lcQpaScreen) |
||||
Q_DECLARE_LOGGING_CATEGORY(lcQpaEvents) |
||||
Q_DECLARE_LOGGING_CATEGORY(lcQpaXcb) |
||||
+Q_DECLARE_LOGGING_CATEGORY(lcQpaXcbError) |
||||
Q_DECLARE_LOGGING_CATEGORY(lcQpaPeeker) |
||||
|
||||
class QXcbVirtualDesktop; |
Loading…
Reference in new issue