From 6ed125c0073288f46e544b9d415d1f9a9968cb2d Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Date: Thu, 7 Jan 2016 18:18:07 +0100
Subject: Implicitly use QStringBuilder in all modules

Every Qt module is built with QT_USE_QSTRINGBUILDER by default.
Also define QT_USE_QSTRINGBUILDER in the core API library.
Remove superfluous qstringbuilder.h includes.
Keep the use of operator% to make sure that QT_USE_QSTRINGBUILDER
won't vanish in future build system changes.

Change-Id: I41fd036fc4e6063951cd758aaafdf9aefed7dd5a
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
---
 src/core/browser_context_adapter.cpp    | 1 -
 src/core/content_client_qt.cpp          | 2 --
 src/core/cookie_monster_delegate_qt.cpp | 2 --
 src/core/core_gyp_generator.pro         | 1 +
 src/core/web_engine_library_info.cpp    | 1 -
 5 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/core')

diff --git a/src/core/browser_context_adapter.cpp b/src/core/browser_context_adapter.cpp
index 7b40688a1..0bbb13857 100644
--- a/src/core/browser_context_adapter.cpp
+++ b/src/core/browser_context_adapter.cpp
@@ -52,7 +52,6 @@
 #include <QCoreApplication>
 #include <QDir>
 #include <QString>
-#include <QStringBuilder>
 #include <QStandardPaths>
 
 #include <numeric>
diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp
index 4d6bdc14c..ccc97517e 100644
--- a/src/core/content_client_qt.cpp
+++ b/src/core/content_client_qt.cpp
@@ -49,7 +49,6 @@
 
 #include <QCoreApplication>
 #include <QFile>
-#include <QStringBuilder>
 
 #if defined(ENABLE_PLUGINS)
 #include "content/public/common/pepper_plugin_info.h"
@@ -153,7 +152,6 @@ void ContentClientQt::AddPepperPlugins(std::vector<content::PepperPluginInfo>* p
 #endif
 
 #include <QCoreApplication>
-#include <QStringBuilder>
 
 namespace QtWebEngineCore {
 
diff --git a/src/core/cookie_monster_delegate_qt.cpp b/src/core/cookie_monster_delegate_qt.cpp
index e740d01e7..3689d54d7 100644
--- a/src/core/cookie_monster_delegate_qt.cpp
+++ b/src/core/cookie_monster_delegate_qt.cpp
@@ -44,8 +44,6 @@
 #include "api/qwebenginecookiestore_p.h"
 #include "type_conversion.h"
 
-#include <QStringBuilder>
-
 namespace QtWebEngineCore {
 
 static GURL sourceUrlForCookie(const QNetworkCookie &cookie) {
diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro
index 14b8d78e2..0685abd7e 100644
--- a/src/core/core_gyp_generator.pro
+++ b/src/core/core_gyp_generator.pro
@@ -11,6 +11,7 @@ include(core_common.pri)
 
 # Defining keywords such as 'signal' clashes with the chromium code base.
 DEFINES += QT_NO_KEYWORDS \
+           QT_USE_QSTRINGBUILDER \
            Q_FORWARD_DECLARE_OBJC_CLASS=QT_FORWARD_DECLARE_CLASS \
            QTWEBENGINEPROCESS_NAME=\\\"$$QTWEBENGINEPROCESS_NAME\\\" \
            QTWEBENGINECORE_VERSION_STR=\\\"$$MODULE_VERSION\\\" \
diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp
index 7b8858e44..a3c599208 100644
--- a/src/core/web_engine_library_info.cpp
+++ b/src/core/web_engine_library_info.cpp
@@ -52,7 +52,6 @@
 #include <QLibraryInfo>
 #include <QStandardPaths>
 #include <QString>
-#include <QStringBuilder>
 
 #ifndef QTWEBENGINEPROCESS_NAME
 #error "No name defined for QtWebEngine's process"
-- 
cgit v1.2.3