From d04f52684a1feb544977697fbdb2ac1c27f02e1d Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@laimg.moc>
Date: Mon, 9 Jul 2018 14:28:45 +0000
Subject: [PATCH] minor cleanup

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---
 src/3rdparty/javascriptcore/wtf/Platform.h | 21 +--------------------
 src/core/CMakeLists.txt                    |  1 -
 src/core/plugin/qlibrary_unix.cpp          |  6 +++---
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/src/3rdparty/javascriptcore/wtf/Platform.h b/src/3rdparty/javascriptcore/wtf/Platform.h
index 2c9acdee0..82286944c 100644
--- a/src/3rdparty/javascriptcore/wtf/Platform.h
+++ b/src/3rdparty/javascriptcore/wtf/Platform.h
@@ -432,28 +432,9 @@ QT_USE_NAMESPACE
 /* Operating environments */
 
 /* FIXME: these are all mixes of OS, operating environment and policy choices. */
-/* PLATFORM(CHROMIUM) */
-/* PLATFORM(QT) */
-/* PLATFORM(WX) */
-/* PLATFORM(GTK) */
 /* PLATFORM(HAIKU) */
-/* PLATFORM(MAC) */
-/* PLATFORM(WIN) */
-#define WTF_PLATFORM_QT 1
-
-/* PLATFORM(IPHONE) */
-/* FIXME: this is sometimes used as an OS switch and sometimes for higher-level things */
-#if (defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
-#define WTF_PLATFORM_IPHONE 1
-#endif
-
-#if !defined(WTF_PLATFORM_IPHONE)
-#define WTF_PLATFORM_IPHONE 0
-#endif
-
 /* PLATFORM(ANDROID) */
-/* FIXME: this is sometimes used as an OS() switch, and other times to drive
-   policy choices */
+
 #if defined(ANDROID)
 #define WTF_PLATFORM_ANDROID 1
 #endif
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index a4790865f..633663ea7 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -257,7 +257,6 @@ include(global/global.cmake)
 include(io/io.cmake)
 include(json/json.cmake)
 include(kernel/kernel.cmake)
-#include(mimetypes/mimetypes.cmake)
 include(plugin/plugin.cmake)
 include(thread/thread.cmake)
 include(tools/tools.cmake)
diff --git a/src/core/plugin/qlibrary_unix.cpp b/src/core/plugin/qlibrary_unix.cpp
index 41bdd212f..38be5dffd 100644
--- a/src/core/plugin/qlibrary_unix.cpp
+++ b/src/core/plugin/qlibrary_unix.cpp
@@ -241,11 +241,11 @@ void* QLibraryPrivate::resolve_sys(const char* symbol)
     void* address = dlsym(pHnd, undrscr_symbol);
     delete [] undrscr_symbol;
 #elif defined(QT_HPUX_LD)
-    void* address = 0;
+    void* address = Q_NULLPTR;
     if (shl_findsym((shl_t*)&pHnd, symbol, TYPE_UNDEFINED, &address) < 0)
-        address = 0;
+        address = Q_NULLPTR;
 #elif defined (QT_NO_DYNAMIC_LIBRARY)
-    void *address = 0;
+    void *address = Q_NULLPTR;
 #else
     void* address = dlsym(pHnd, symbol);
 #endif