Skip to content
This repository has been archived by the owner on May 30, 2023. It is now read-only.

Fix building on Qt 5.8+ (closes #14956) #15119

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/qt-qpa-platform-plugin/phantom.pri
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
QT += core-private gui-private platformsupport-private
QT += core-private gui-private

lessThan(QT_MINOR_VERSION, 8) {
QT += platformsupport-private
} else {
QT += fontdatabase_support_private eventdispatcher_support_private
}

SOURCES += $$PWD/phantomintegration.cpp \
$$PWD/phantombackingstore.cpp
Expand Down
13 changes: 11 additions & 2 deletions src/qt-qpa-platform-plugin/phantomintegration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,24 @@
#include "phantomintegration.h"
#include "phantombackingstore.h"

#include <QtGlobal>
#include <private/qpixmap_raster_p.h>

#if defined(Q_OS_MAC)
# include <QtPlatformSupport/private/qcoretextfontdatabase_p.h>
#else
# include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h>
# if QT_VERSION < QT_VERSION_CHECK(5, 8, 0)
# include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h>
# else
# include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
# endif
#endif

#include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
#if QT_VERSION < QT_VERSION_CHECK(5, 8, 0)
# include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
#else
# include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
#endif

#include <qpa/qplatformnativeinterface.h>
#include <qpa/qplatformscreen.h>
Expand Down