From 93af389b0cb786864af8e54d53c7da308cb557a8 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Thu, 1 Feb 2018 16:24:43 +0200
Subject: Remove QtQuickCompiler workarounds

QtQuickCompiler workarounds are no longer required with Qt 5.11 and need
to be removed to fix build failure where private/qqmlmetatype_p.h was not
found, since QT+=qml-private is no longer done by qtquickcompiler.prf.

Change-Id: I48f640a5b7196b295de89589d14061011ed920fc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/virtualkeyboard/inputcontext.cpp            | 9 ---------
 src/virtualkeyboard/virtualkeyboard.pro         | 2 --
 src/virtualkeyboard/virtualkeyboardsettings.cpp | 5 -----
 3 files changed, 16 deletions(-)

(limited to 'src')

diff --git a/src/virtualkeyboard/inputcontext.cpp b/src/virtualkeyboard/inputcontext.cpp
index 2c2c8fcf..38f61500 100644
--- a/src/virtualkeyboard/inputcontext.cpp
+++ b/src/virtualkeyboard/inputcontext.cpp
@@ -40,10 +40,6 @@
 #include <QGuiApplication>
 #include <QtCore/private/qobject_p.h>
 
-#ifdef COMPILING_QML
-#include <private/qqmlmetatype_p.h>
-#endif
-
 QT_BEGIN_NAMESPACE
 bool operator==(const QInputMethodEvent::Attribute &attribute1, const QInputMethodEvent::Attribute &attribute2)
 {
@@ -550,10 +546,6 @@ void InputContext::clear()
 */
 bool InputContext::fileExists(const QUrl &fileUrl)
 {
-#ifdef COMPILING_QML
-    // workaround that qtquickcompiler removes *.qml file paths from qrc file (QTRD-3268)
-    return QQmlMetaType::findCachedCompilationUnit(fileUrl);
-#else
     QString fileName;
     if (fileUrl.scheme() == QLatin1String("qrc")) {
         fileName = QLatin1Char(':') + fileUrl.path();
@@ -561,7 +553,6 @@ bool InputContext::fileExists(const QUrl &fileUrl)
         fileName = fileUrl.toLocalFile();
     }
     return !fileName.isEmpty() && QFile::exists(fileName);
-#endif
 }
 
 /*!
diff --git a/src/virtualkeyboard/virtualkeyboard.pro b/src/virtualkeyboard/virtualkeyboard.pro
index 2b2f2aac..b8d0a8dc 100644
--- a/src/virtualkeyboard/virtualkeyboard.pro
+++ b/src/virtualkeyboard/virtualkeyboard.pro
@@ -304,8 +304,6 @@ OTHER_FILES += \
 SOURCES += appinputpanel.cpp
 HEADERS += appinputpanel.h
 
-qtquickcompiler: DEFINES += COMPILING_QML
-
 !disable-hunspell {
     exists(3rdparty/hunspell/src/hunspell/hunspell.h) {
         SOURCES += hunspellinputmethod.cpp hunspellinputmethod_p.cpp hunspellworker.cpp
diff --git a/src/virtualkeyboard/virtualkeyboardsettings.cpp b/src/virtualkeyboard/virtualkeyboardsettings.cpp
index 7280903c..11ddae2d 100644
--- a/src/virtualkeyboard/virtualkeyboardsettings.cpp
+++ b/src/virtualkeyboard/virtualkeyboardsettings.cpp
@@ -79,12 +79,7 @@ public:
         for (const QString &styleImportPath : qAsConst(styleImportPathList)) {
             QString filePath = buildStyleFilePath(styleImportPath, name);
             bool pathExist = false;
-#ifdef COMPILING_QML
-            // qtquickcompiler removes *.qml file paths from qrc file, but keeps directories - QTRD-3268
-            pathExist = QFileInfo(filePath).dir().exists();
-#else
             pathExist = QFileInfo::exists(filePath);
-#endif
             if (pathExist)
                 return buildStyleImportPath(styleImportPath, name);
         }
-- 
cgit v1.2.3