From 812ac6414ab850e820700f24fb580109cc03ee8a Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@laimg.moc>
Date: Mon, 24 Oct 2016 17:08:16 +0000
Subject: [PATCH] various cleanups

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---
 cmake/modules/FindResolv.cmake |  2 +-
 src/core/xml/qxmlstream.cpp    | 25 +------------------------
 src/declarative/CMakeLists.txt |  1 -
 src/gui/CMakeLists.txt         |  2 +-
 src/gui/text/text.cmake        |  3 ---
 5 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/cmake/modules/FindResolv.cmake b/cmake/modules/FindResolv.cmake
index 8e95fe9a9..3cd913a0f 100644
--- a/cmake/modules/FindResolv.cmake
+++ b/cmake/modules/FindResolv.cmake
@@ -25,7 +25,7 @@ find_path(RESOLV_INCLUDES
 
 find_library(RESOLV_LIBRARIES
     NAMES
-    resolv  c
+    resolv c
     HINTS
     $ENV{RESOLVDIR}/lib
     ${LIB_INSTALL_DIR}
diff --git a/src/core/xml/qxmlstream.cpp b/src/core/xml/qxmlstream.cpp
index 0a9f574f7..fd0776831 100644
--- a/src/core/xml/qxmlstream.cpp
+++ b/src/core/xml/qxmlstream.cpp
@@ -41,13 +41,6 @@
 
 #include "QtCore/qxmlstream.h"
 
-#if defined(QT_BUILD_XML_LIB) && defined(Q_OS_MAC64)
-// No need to define this in the 64-bit Mac libraries.
-// Since Qt 4.4 and previous weren't supported in 64-bit, there are
-// no QXmlStream* symbols to keep compatibility with
-# define QT_NO_XMLSTREAM
-#endif
-
 #ifndef QT_NO_XMLSTREAM
 
 #include "qxmlutils_p.h"
@@ -57,24 +50,8 @@
 #include <qtextcodec.h>
 #include <qstack.h>
 #include <qbuffer.h>
-#ifndef QT_BOOTSTRAPPED
 #include <qcoreapplication.h>
-#else
-// This specialization of Q_DECLARE_TR_FUNCTIONS is not in qcoreapplication.h,
-// because that header depends on QObject being available, which is not the
-// case for most bootstrapped applications.
-#define Q_DECLARE_TR_FUNCTIONS(context) \
-public: \
-    static inline QString tr(const char *sourceText, const char *comment = 0) \
-        { Q_UNUSED(comment); return QString::fromLatin1(sourceText); } \
-    static inline QString trUtf8(const char *sourceText, const char *comment = 0) \
-        { Q_UNUSED(comment); return QString::fromLatin1(sourceText); } \
-    static inline QString tr(const char *sourceText, const char*, int) \
-        { return QString::fromLatin1(sourceText); } \
-    static inline QString trUtf8(const char *sourceText, const char*, int) \
-        { return QString::fromLatin1(sourceText); } \
-private:
-#endif
+
 QT_BEGIN_NAMESPACE
 
 #include "qxmlstream_p.h"
diff --git a/src/declarative/CMakeLists.txt b/src/declarative/CMakeLists.txt
index 204f5ec97..47ece26a6 100644
--- a/src/declarative/CMakeLists.txt
+++ b/src/declarative/CMakeLists.txt
@@ -1,7 +1,6 @@
 add_definitions(
     -DQT_BUILD_DECLARATIVE_LIB
     -DQT_NO_URL_CAST_FROM_STRING
-    -DQT_NO_OPENTYPE
 )
 set(EXTRA_DECLARATIVE_LIBS KtCore KtGui KtNetwork KtScript)
 
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 1c9c3a1e5..f0f98a3bd 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -506,7 +506,7 @@ if(WITH_HARFBUZZ AND HARFBUZZ_FOUND)
     include_directories(${HARFBUZZ_INCLUDE_DIRS})
 else()
     # TODO: move to main CMakeLists?
-    add_definitions(-DHB_EXPORT=Q_CORE_EXPORT)
+    add_definitions(-DHB_EXPORT=Q_CORE_EXPORT -DQT_NO_OPENTYPE)
     set(KtGui_SOURCES
         ${KtGui_SOURCES}
         ${CMAKE_SOURCE_DIR}/src/3rdparty/harfbuzz/src/harfbuzz-buffer.c
diff --git a/src/gui/text/text.cmake b/src/gui/text/text.cmake
index 39ce407d6..69064a942 100644
--- a/src/gui/text/text.cmake
+++ b/src/gui/text/text.cmake
@@ -80,9 +80,6 @@ set(GUI_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/text/qglyphrun.cpp
 )
 
-include_directories(${CMAKE_SOURCE_DIR}/src/3rdparty/harfbuzz/src)
-add_definitions(-DQT_NO_OPENTYPE)
-
 if(WITH_FREETYPE AND FREETYPE_FOUND)
     set(EXTRA_GUI_LIBS
         ${EXTRA_GUI_LIBS}