diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2016-01-07 18:18:07 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2016-01-09 07:23:24 +0000 |
| commit | 6ed125c0073288f46e544b9d415d1f9a9968cb2d (patch) | |
| tree | d2f2e1337abdb7fbda86e5c0bf4ef417ba90af5f /src/webengine | |
| parent | 8f6684a01cf6d8a4c203bb44698b0a61bcfa8bd2 (diff) | |
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>
Diffstat (limited to 'src/webengine')
| -rw-r--r-- | src/webengine/api/qquickwebenginescript.cpp | 1 | ||||
| -rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 1 | ||||
| -rw-r--r-- | src/webengine/ui_delegates_manager.cpp | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/src/webengine/api/qquickwebenginescript.cpp b/src/webengine/api/qquickwebenginescript.cpp index 71dad701f..a19ec1534 100644 --- a/src/webengine/api/qquickwebenginescript.cpp +++ b/src/webengine/api/qquickwebenginescript.cpp @@ -40,7 +40,6 @@ #include <QQmlFile> #include <QtCore/QDebug> #include <QtCore/QFile> -#include <QtCore/QStringBuilder> #include <QtCore/QTimerEvent> #include "user_script_controller_host.h" diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index fd758bea2..e855d2ad1 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -75,7 +75,6 @@ #include <QQmlWebChannel> #include <QQuickWebEngineProfile> #include <QScreen> -#include <QStringBuilder> #include <QUrl> #include <QTimer> #ifndef QT_NO_ACCESSIBILITY diff --git a/src/webengine/ui_delegates_manager.cpp b/src/webengine/ui_delegates_manager.cpp index d843c9a76..64e22c4a9 100644 --- a/src/webengine/ui_delegates_manager.cpp +++ b/src/webengine/ui_delegates_manager.cpp @@ -48,7 +48,6 @@ #include <QQmlContext> #include <QQmlEngine> #include <QQmlProperty> -#include <QStringBuilder> // Uncomment for QML debugging //#define UI_DELEGATES_DEBUG |