forked from pool/libqt5-qtbase
Accepting request 618663 from KDE:Qt5
Qt 5.11.1 OBS-URL: https://build.opensuse.org/request/show/618663 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=83
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
parent
4ab7bab186
commit
89dc4266b9
@ -1,59 +0,0 @@
|
||||
From b0f3cc1594308ed3f3977bdcd451e8cf0eb0478d Mon Sep 17 00:00:00 2001
|
||||
From: Andy Shaw <andy.shaw@qt.io>
|
||||
Date: Tue, 15 May 2018 22:15:04 +0200
|
||||
Subject: [PATCH] sqlite: Allow for duplicated placeholders with just one
|
||||
placeholder
|
||||
|
||||
This accounts for a case of a placeholder being duplicated in the
|
||||
prepare query, but where only one placeholder was used. This amends
|
||||
e4e87a2ece1e0c9901514fea094f31863b64b570
|
||||
|
||||
Task-number: QTBUG-68299
|
||||
Change-Id: Ia92ee912facd51a13e7222886debb219b24442b0
|
||||
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
||||
---
|
||||
src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp | 4 ++--
|
||||
tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp | 10 ++++++++++
|
||||
2 files changed, 12 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp
|
||||
index a862e8d2a7..2a770d0245 100644
|
||||
--- a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp
|
||||
+++ b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp
|
||||
@@ -496,10 +496,10 @@ bool QSQLiteResult::exec()
|
||||
|
||||
#if (SQLITE_VERSION_NUMBER >= 3003011)
|
||||
// In the case of the reuse of a named placeholder
|
||||
- // We need to check explicitly that paramCount is greater than 1, as sqlite
|
||||
+ // We need to check explicitly that paramCount is greater than or equal to 1, as sqlite
|
||||
// can end up in a case where for virtual tables it returns 0 even though it
|
||||
// has parameters
|
||||
- if (paramCount > 1 && paramCount < values.count()) {
|
||||
+ if (paramCount >= 1 && paramCount < values.count()) {
|
||||
const auto countIndexes = [](int counter, const QVector<int> &indexList) {
|
||||
return counter + indexList.length();
|
||||
};
|
||||
diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
|
||||
index 23c8460133..38da5431fa 100644
|
||||
--- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
|
||||
+++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
|
||||
@@ -2347,6 +2347,16 @@ void tst_QSqlQuery::prepare_bind_exec()
|
||||
QCOMPARE(q.value(0).toInt(), 107);
|
||||
QCOMPARE(q.value(1).toString(), QString("name"));
|
||||
QCOMPARE(q.value(2).toString(), QString("107"));
|
||||
+
|
||||
+ // Test just duplicated placeholders
|
||||
+ QVERIFY(q.prepare("insert into " + qtest_prepare + " (id, name, name2) values (110, :name, :name)"));
|
||||
+ q.bindValue(":name", "name");
|
||||
+ QVERIFY_SQL(q, exec());
|
||||
+ QVERIFY(q.exec("select * from " + qtest_prepare + " where id > 109 order by id"));
|
||||
+ QVERIFY(q.next());
|
||||
+ QCOMPARE(q.value(0).toInt(), 110);
|
||||
+ QCOMPARE(q.value(1).toString(), QString("name"));
|
||||
+ QCOMPARE(q.value(2).toString(), QString("name"));
|
||||
} // end of SQLite scope
|
||||
}
|
||||
|
||||
--
|
||||
2.16.2
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
From: Fabian Vogt <fabian@ritter-vogt.de>
|
||||
Subject: Forcee inclusion of _PRIVATE_INCLUDE_DIRS to CMakeConfig files
|
||||
References: QTBUG-37417
|
||||
|
||||
This is broken for shadow builds otherwise.
|
||||
|
||||
Index: qtbase-everywhere-src-5.11.0-beta4/mkspecs/features/create_cmake.prf
|
||||
===================================================================
|
||||
--- qtbase-everywhere-src-5.11.0-beta4.orig/mkspecs/features/create_cmake.prf
|
||||
+++ qtbase-everywhere-src-5.11.0-beta4/mkspecs/features/create_cmake.prf
|
||||
@@ -30,7 +30,6 @@ CMAKE_MODULE_NAME = $$cmakeModuleName($$
|
||||
|
||||
split_incpath {
|
||||
CMAKE_ADD_SOURCE_INCLUDE_DIRS = true
|
||||
- CMAKE_NO_PRIVATE_INCLUDES = true # Don't add private includes in the build dir which don't exist
|
||||
CMAKE_SOURCE_INCLUDES = \
|
||||
$$cmakeTargetPaths($$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/Qt$${CMAKE_MODULE_NAME})
|
||||
CMAKE_SOURCE_PRIVATE_INCLUDES = \
|
||||
@@ -53,10 +52,6 @@ contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*"
|
||||
CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True
|
||||
}
|
||||
|
||||
-isEmpty(QT.$${MODULE}_private.includes)| \
|
||||
- !exists($$first(QT.$${MODULE}_private.includes)): \
|
||||
- CMAKE_NO_PRIVATE_INCLUDES = true
|
||||
-
|
||||
CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX])
|
||||
contains(CMAKE_LIB_DIR,"^\\.\\./.*") {
|
||||
CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/
|
||||
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 19 10:49:46 CEST 2018 - fabian@ritter-vogt.de
|
||||
|
||||
- Update to 5.11.1
|
||||
* New bugfix release
|
||||
* For more details please see:
|
||||
* http://code.qt.io/cgit/qt/qtbase.git/plain/dist/changes-5.11.1/?h=v5.11.1
|
||||
- Drop patches, now upstream:
|
||||
* force-cmake-private-headers.patch
|
||||
* 0001-sqlite-Allow-for-duplicated-placeholders-with-just-o.patch
|
||||
* xcb-fix-regression-with-remote-X11-clients.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 13 17:14:22 UTC 2018 - fabian@ritter-vogt.de
|
||||
|
||||
|
||||
@ -36,16 +36,16 @@
|
||||
%endif
|
||||
|
||||
Name: libqt5-qtbase
|
||||
Version: 5.11.0
|
||||
Version: 5.11.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.11.0
|
||||
%define so_version 5.11.0
|
||||
%define tar_version qtbase-everywhere-src-5.11.0
|
||||
%define real_version 5.11.1
|
||||
%define so_version 5.11.1
|
||||
%define tar_version qtbase-everywhere-src-5.11.1
|
||||
Source: https://download.qt.io/official_releases/qt/5.11/%{real_version}/submodules/%{tar_version}.tar.xz
|
||||
# to get mtime of file:
|
||||
Source1: libqt5-qtbase.changes
|
||||
@ -63,14 +63,10 @@ Patch10: libqt5-prioritise-gtk2-platformtheme.patch
|
||||
# PATCH-FEATURE-OPENSUSE 0001-Add-remote-print-queue-support.patch fate#322052 -- Automatically recognize and allow printing to remote cups servers
|
||||
Patch12: 0001-Add-remote-print-queue-support.patch
|
||||
# PATCH-FIX-OPENSUSE
|
||||
Patch15: force-cmake-private-headers.patch
|
||||
# PATCH-FIX-OPENSUSE
|
||||
Patch16: 0001-Hack-together-a-way-to-get-fallback-from-xcb-working.patch
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch17: qapplication-emit-palettechanged.patch
|
||||
# patches 1000- 2000 and above from upstream 5.11 branch #
|
||||
Patch1000: 0001-sqlite-Allow-for-duplicated-placeholders-with-just-o.patch
|
||||
Patch1001: xcb-fix-regression-with-remote-X11-clients.patch
|
||||
# patches 2000-3000 and above from upstream 5.12/dev branch #
|
||||
BuildRequires: alsa-devel
|
||||
BuildRequires: cups-devel
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ed6e46db84f7d34923ab4eae165c63e05ab3cfa9d19a73d3f57b4e7bfd41de66
|
||||
size 46803416
|
||||
3
qtbase-everywhere-src-5.11.1.tar.xz
Normal file
3
qtbase-everywhere-src-5.11.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a0d047b2da5782c8332c59ae203984b64e4d5dc5f4ba9c0884fdbe753d0afb46
|
||||
size 46860400
|
||||
@ -1,309 +0,0 @@
|
||||
From 67227aeffdf94be8d177309d27291d5b3247586c Mon Sep 17 00:00:00 2001
|
||||
From: Gatis Paeglis <gatis.paeglis@qt.io>
|
||||
Date: Mon, 4 Jun 2018 17:24:53 +0200
|
||||
Subject: xcb: fix regression with remote X11 clients
|
||||
|
||||
There were several issues here:
|
||||
|
||||
We were attempting to use MIT-SHM functions over SSH connection,
|
||||
which is not supported. X server should detect this and return with
|
||||
an appropriate error message. It does actually return BadAccess for
|
||||
non-fd code path, but Qt was stubbornly trying to repeat this action
|
||||
and always falling back to malloc (during window resizing). For fd
|
||||
code path we were hitting X server bug, which would result in window
|
||||
freeze [1].
|
||||
|
||||
During the initialization we check if xcb_shm_attach_checked() fails,
|
||||
and disable MIT-SHM if it does. We use this logic to detect if we
|
||||
are running remotely, as there are no public APIs for it. This way
|
||||
we can avoid X server bug and avoid needless calling of code path
|
||||
which will _always_ fail on a remote X11 connection.
|
||||
|
||||
[1] https://lists.x.org/archives/xorg-devel/2018-June/057011.html
|
||||
|
||||
Task-number: QTBUG-68449
|
||||
Task-number: QTBUG-68783
|
||||
Change-Id: I7ab3dcf0f323fd53001b9f7b88c2cb10809af509
|
||||
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
|
||||
---
|
||||
src/plugins/platforms/xcb/qxcbbackingstore.cpp | 107 ++++++++++++++-----------
|
||||
src/plugins/platforms/xcb/qxcbbackingstore.h | 3 +
|
||||
src/plugins/platforms/xcb/qxcbconnection.cpp | 31 +++++--
|
||||
3 files changed, 88 insertions(+), 53 deletions(-)
|
||||
|
||||
diff --git a/src/plugins/platforms/xcb/qxcbbackingstore.cpp b/src/plugins/platforms/xcb/qxcbbackingstore.cpp
|
||||
index 8cfcc49f9a..b81cb8efa1 100644
|
||||
--- a/src/plugins/platforms/xcb/qxcbbackingstore.cpp
|
||||
+++ b/src/plugins/platforms/xcb/qxcbbackingstore.cpp
|
||||
@@ -95,6 +95,9 @@ public:
|
||||
void put(xcb_drawable_t dst, const QRegion ®ion, const QPoint &offset);
|
||||
void preparePaint(const QRegion ®ion);
|
||||
|
||||
+ static bool createSystemVShmSegment(QXcbConnection *c, size_t segmentSize = 1,
|
||||
+ xcb_shm_segment_info_t *shm_info = nullptr);
|
||||
+
|
||||
private:
|
||||
void createShmSegment(size_t segmentSize);
|
||||
void destroyShmSegment(size_t segmentSize);
|
||||
@@ -325,15 +328,16 @@ void QXcbBackingStoreImage::createShmSegment(size_t segmentSize)
|
||||
#ifdef XCB_USE_SHM_FD
|
||||
if (connection()->hasShmFd()) {
|
||||
if (Q_UNLIKELY(segmentSize > std::numeric_limits<uint32_t>::max())) {
|
||||
- qWarning("QXcbShmImage: xcb_shm_create_segment() can't be called for size %zu, maximum allowed size is %u",
|
||||
- segmentSize, std::numeric_limits<uint32_t>::max());
|
||||
+ qCWarning(lcQpaXcb, "xcb_shm_create_segment() can't be called for size %zu, maximum"
|
||||
+ "allowed size is %u", segmentSize, std::numeric_limits<uint32_t>::max());
|
||||
return;
|
||||
}
|
||||
+
|
||||
const auto seg = xcb_generate_id(xcb_connection());
|
||||
auto reply = Q_XCB_REPLY(xcb_shm_create_segment,
|
||||
xcb_connection(), seg, segmentSize, false);
|
||||
if (!reply) {
|
||||
- qWarning("QXcbShmImage: xcb_shm_create_segment() failed for size %zu", segmentSize);
|
||||
+ qCWarning(lcQpaXcb, "xcb_shm_create_segment() failed for size %zu", segmentSize);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -342,13 +346,13 @@ void QXcbBackingStoreImage::createShmSegment(size_t segmentSize)
|
||||
for (int i = 0; i < reply->nfd; i++)
|
||||
close(fds[i]);
|
||||
|
||||
- qWarning("QXcbShmImage: failed to get file descriptor for shm segment of size %zu", segmentSize);
|
||||
+ qCWarning(lcQpaXcb, "failed to get file descriptor for shm segment of size %zu", segmentSize);
|
||||
return;
|
||||
}
|
||||
|
||||
void *addr = mmap(nullptr, segmentSize, PROT_READ|PROT_WRITE, MAP_SHARED, fds[0], 0);
|
||||
if (addr == MAP_FAILED) {
|
||||
- qWarning("QXcbShmImage: failed to mmap segment from X server (%d: %s) for size %zu",
|
||||
+ qCWarning(lcQpaXcb, "failed to mmap segment from X server (%d: %s) for size %zu",
|
||||
errno, strerror(errno), segmentSize);
|
||||
close(fds[0]);
|
||||
xcb_shm_detach(xcb_connection(), seg);
|
||||
@@ -358,47 +362,54 @@ void QXcbBackingStoreImage::createShmSegment(size_t segmentSize)
|
||||
close(fds[0]);
|
||||
m_shm_info.shmseg = seg;
|
||||
m_shm_info.shmaddr = static_cast<quint8 *>(addr);
|
||||
-
|
||||
m_segmentSize = segmentSize;
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
- const int id = shmget(IPC_PRIVATE, segmentSize, IPC_CREAT | 0600);
|
||||
- if (id == -1) {
|
||||
- qWarning("QXcbShmImage: shmget() failed (%d: %s) for size %zu",
|
||||
- errno, strerror(errno), segmentSize);
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- void *addr = shmat(id, 0, 0);
|
||||
- if (addr == (void *)-1) {
|
||||
- qWarning("QXcbShmImage: shmat() failed (%d: %s) for id %d",
|
||||
- errno, strerror(errno), id);
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- if (shmctl(id, IPC_RMID, 0) == -1)
|
||||
- qWarning("QXcbBackingStore: Error while marking the shared memory segment to be destroyed");
|
||||
+ if (createSystemVShmSegment(connection(), segmentSize, &m_shm_info))
|
||||
+ m_segmentSize = segmentSize;
|
||||
+ }
|
||||
+}
|
||||
|
||||
- const auto seg = xcb_generate_id(xcb_connection());
|
||||
- auto cookie = xcb_shm_attach_checked(xcb_connection(), seg, id, false);
|
||||
- auto *error = xcb_request_check(xcb_connection(), cookie);
|
||||
- if (error) {
|
||||
- connection()->printXcbError("QXcbShmImage: xcb_shm_attach() failed with error", error);
|
||||
- free(error);
|
||||
- if (shmdt(addr) == -1) {
|
||||
- qWarning("QXcbShmImage: shmdt() failed (%d: %s) for %p",
|
||||
- errno, strerror(errno), addr);
|
||||
- }
|
||||
- return;
|
||||
- }
|
||||
+bool QXcbBackingStoreImage::createSystemVShmSegment(QXcbConnection *c, size_t segmentSize,
|
||||
+ xcb_shm_segment_info_t *shmInfo)
|
||||
+{
|
||||
+ const int id = shmget(IPC_PRIVATE, segmentSize, IPC_CREAT | 0600);
|
||||
+ if (id == -1) {
|
||||
+ qCWarning(lcQpaXcb, "shmget() failed (%d: %s) for size %zu", errno, strerror(errno), segmentSize);
|
||||
+ return false;
|
||||
+ }
|
||||
|
||||
- m_shm_info.shmseg = seg;
|
||||
- m_shm_info.shmid = id; // unused
|
||||
- m_shm_info.shmaddr = static_cast<quint8 *>(addr);
|
||||
+ void *addr = shmat(id, 0, 0);
|
||||
+ if (addr == (void *)-1) {
|
||||
+ qCWarning(lcQpaXcb, "shmat() failed (%d: %s) for id %d", errno, strerror(errno), id);
|
||||
+ return false;
|
||||
+ }
|
||||
|
||||
- m_segmentSize = segmentSize;
|
||||
+ if (shmctl(id, IPC_RMID, 0) == -1)
|
||||
+ qCWarning(lcQpaXcb, "Error while marking the shared memory segment to be destroyed");
|
||||
+
|
||||
+ const auto seg = xcb_generate_id(c->xcb_connection());
|
||||
+ auto cookie = xcb_shm_attach_checked(c->xcb_connection(), seg, id, false);
|
||||
+ auto *error = xcb_request_check(c->xcb_connection(), cookie);
|
||||
+ if (error) {
|
||||
+ c->printXcbError("xcb_shm_attach() failed with error", error);
|
||||
+ free(error);
|
||||
+ if (shmdt(addr) == -1)
|
||||
+ qCWarning(lcQpaXcb, "shmdt() failed (%d: %s) for %p", errno, strerror(errno), addr);
|
||||
+ return false;
|
||||
+ } else if (!shmInfo) { // this was a test run, free the allocated test segment
|
||||
+ xcb_shm_detach(c->xcb_connection(), seg);
|
||||
+ auto shmaddr = static_cast<quint8 *>(addr);
|
||||
+ if (shmdt(shmaddr) == -1)
|
||||
+ qCWarning(lcQpaXcb, "shmdt() failed (%d: %s) for %p", errno, strerror(errno), shmaddr);
|
||||
+ }
|
||||
+ if (shmInfo) {
|
||||
+ shmInfo->shmseg = seg;
|
||||
+ shmInfo->shmid = id; // unused
|
||||
+ shmInfo->shmaddr = static_cast<quint8 *>(addr);
|
||||
}
|
||||
+ return true;
|
||||
}
|
||||
|
||||
void QXcbBackingStoreImage::destroyShmSegment(size_t segmentSize)
|
||||
@@ -409,21 +420,21 @@ void QXcbBackingStoreImage::destroyShmSegment(size_t segmentSize)
|
||||
auto cookie = xcb_shm_detach_checked(xcb_connection(), m_shm_info.shmseg);
|
||||
xcb_generic_error_t *error = xcb_request_check(xcb_connection(), cookie);
|
||||
if (error)
|
||||
- connection()->printXcbError("QXcbShmImage: xcb_shm_detach() failed with error", error);
|
||||
+ connection()->printXcbError("xcb_shm_detach() failed with error", error);
|
||||
m_shm_info.shmseg = 0;
|
||||
|
||||
#ifdef XCB_USE_SHM_FD
|
||||
if (connection()->hasShmFd()) {
|
||||
if (munmap(m_shm_info.shmaddr, segmentSize) == -1) {
|
||||
- qWarning("QXcbShmImage: munmap() failed (%d: %s) for %p with size %zu",
|
||||
- errno, strerror(errno), m_shm_info.shmaddr, segmentSize);
|
||||
+ qCWarning(lcQpaXcb, "munmap() failed (%d: %s) for %p with size %zu",
|
||||
+ errno, strerror(errno), m_shm_info.shmaddr, segmentSize);
|
||||
}
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
if (shmdt(m_shm_info.shmaddr) == -1) {
|
||||
- qWarning("QXcbShmImage: shmdt() failed (%d: %s) for %p",
|
||||
- errno, strerror(errno), m_shm_info.shmaddr);
|
||||
+ qCWarning(lcQpaXcb, "shmdt() failed (%d: %s) for %p",
|
||||
+ errno, strerror(errno), m_shm_info.shmaddr);
|
||||
}
|
||||
m_shm_info.shmid = 0; // unused
|
||||
}
|
||||
@@ -718,6 +729,12 @@ void QXcbBackingStoreImage::preparePaint(const QRegion ®ion)
|
||||
m_pendingFlush |= region;
|
||||
}
|
||||
|
||||
+bool QXcbBackingStore::createSystemVShmSegment(QXcbConnection *c, size_t segmentSize, void *shmInfo)
|
||||
+{
|
||||
+ auto info = reinterpret_cast<xcb_shm_segment_info_t *>(shmInfo);
|
||||
+ return QXcbBackingStoreImage::createSystemVShmSegment(c, segmentSize, info);
|
||||
+}
|
||||
+
|
||||
QXcbBackingStore::QXcbBackingStore(QWindow *window)
|
||||
: QPlatformBackingStore(window)
|
||||
{
|
||||
@@ -757,7 +774,7 @@ void QXcbBackingStore::beginPaint(const QRegion ®ion)
|
||||
void QXcbBackingStore::endPaint()
|
||||
{
|
||||
if (Q_UNLIKELY(m_paintRegions.isEmpty())) {
|
||||
- qWarning("%s: paint regions empty!", Q_FUNC_INFO);
|
||||
+ qCWarning(lcQpaXcb, "%s: paint regions empty!", Q_FUNC_INFO);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -811,7 +828,7 @@ void QXcbBackingStore::flush(QWindow *window, const QRegion ®ion, const QPoin
|
||||
|
||||
QXcbWindow *platformWindow = static_cast<QXcbWindow *>(window->handle());
|
||||
if (!platformWindow) {
|
||||
- qWarning("QXcbBackingStore::flush: QWindow has no platform window (QTBUG-32681)");
|
||||
+ qCWarning(lcQpaXcb, "%s QWindow has no platform window, see QTBUG-32681", Q_FUNC_INFO);
|
||||
return;
|
||||
}
|
||||
|
||||
diff --git a/src/plugins/platforms/xcb/qxcbbackingstore.h b/src/plugins/platforms/xcb/qxcbbackingstore.h
|
||||
index 747626c213..734de1f7d7 100644
|
||||
--- a/src/plugins/platforms/xcb/qxcbbackingstore.h
|
||||
+++ b/src/plugins/platforms/xcb/qxcbbackingstore.h
|
||||
@@ -74,6 +74,9 @@ public:
|
||||
void beginPaint(const QRegion &) override;
|
||||
void endPaint() override;
|
||||
|
||||
+ static bool createSystemVShmSegment(QXcbConnection *c, size_t segmentSize = 1,
|
||||
+ void *shmInfo = nullptr);
|
||||
+
|
||||
private:
|
||||
QXcbBackingStoreImage *m_image = nullptr;
|
||||
QStack<QRegion> m_paintRegions;
|
||||
diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp
|
||||
index d971de766d..8ed73bc270 100644
|
||||
--- a/src/plugins/platforms/xcb/qxcbconnection.cpp
|
||||
+++ b/src/plugins/platforms/xcb/qxcbconnection.cpp
|
||||
@@ -55,6 +55,7 @@
|
||||
#include "qxcbsystemtraytracker.h"
|
||||
#include "qxcbglintegrationfactory.h"
|
||||
#include "qxcbglintegration.h"
|
||||
+#include "qxcbbackingstore.h"
|
||||
|
||||
#include <QSocketNotifier>
|
||||
#include <QAbstractEventDispatcher>
|
||||
@@ -973,7 +974,7 @@ void QXcbConnection::printXcbError(const char *message, xcb_generic_error_t *err
|
||||
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("%s: %d (%s), sequence: %d, resource id: %d, major code: %d (%s), minor code: %d",
|
||||
+ qCWarning(lcQpaXcb, "%s: %d (%s), sequence: %d, resource id: %d, major code: %d (%s), minor code: %d",
|
||||
message,
|
||||
int(error->error_code), xcb_errors[clamped_error_code],
|
||||
int(error->sequence), int(error->resource_id),
|
||||
@@ -2103,20 +2104,34 @@ void QXcbConnection::initializeShm()
|
||||
{
|
||||
const xcb_query_extension_reply_t *reply = xcb_get_extension_data(m_connection, &xcb_shm_id);
|
||||
if (!reply || !reply->present) {
|
||||
- qWarning("QXcbConnection: MIT-SHM extension is not present on the X server.");
|
||||
+ qCDebug(lcQpaXcb, "MIT-SHM extension is not present on the X server");
|
||||
return;
|
||||
}
|
||||
-
|
||||
has_shm = true;
|
||||
|
||||
auto shm_query = Q_XCB_REPLY(xcb_shm_query_version, m_connection);
|
||||
- if (!shm_query) {
|
||||
- qWarning("QXcbConnection: Failed to request MIT-SHM version");
|
||||
- return;
|
||||
+ if (shm_query) {
|
||||
+ has_shm_fd = (shm_query->major_version == 1 && shm_query->minor_version >= 2) ||
|
||||
+ shm_query->major_version > 1;
|
||||
+ } else {
|
||||
+ qCWarning(lcQpaXcb, "QXcbConnection: Failed to request MIT-SHM version");
|
||||
}
|
||||
|
||||
- has_shm_fd = (shm_query->major_version == 1 && shm_query->minor_version >= 2) ||
|
||||
- shm_query->major_version > 1;
|
||||
+ qCDebug(lcQpaXcb) << "Has MIT-SHM :" << has_shm;
|
||||
+ qCDebug(lcQpaXcb) << "Has MIT-SHM FD :" << has_shm_fd;
|
||||
+
|
||||
+ // Temporary disable warnings (unless running in debug mode).
|
||||
+ auto logging = const_cast<QLoggingCategory*>(&lcQpaXcb());
|
||||
+ bool wasEnabled = logging->isEnabled(QtMsgType::QtWarningMsg);
|
||||
+ if (!logging->isEnabled(QtMsgType::QtDebugMsg))
|
||||
+ logging->setEnabled(QtMsgType::QtWarningMsg, false);
|
||||
+ if (!QXcbBackingStore::createSystemVShmSegment(this)) {
|
||||
+ qCDebug(lcQpaXcb, "failed to create System V shared memory segment (remote "
|
||||
+ "X11 connection?), disabling SHM");
|
||||
+ has_shm = has_shm_fd = false;
|
||||
+ }
|
||||
+ if (wasEnabled)
|
||||
+ logging->setEnabled(QtMsgType::QtWarningMsg, true);
|
||||
}
|
||||
|
||||
void QXcbConnection::initializeXFixes()
|
||||
--
|
||||
cgit v1.1-6-g87c4
|
||||
|
||||
Loading…
Reference in New Issue
Block a user