diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-13 21:26:34 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-13 21:26:34 +0100 |
commit | beaeeb99881184fd368c121fcbb1a31c78b794a3 (patch) | |
tree | 0e078499d8fe3e8627e3612537e61f2dd1029625 /Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp | |
parent | f7697030f444b5e16331c6d0a99712736b9ff026 (diff) | |
parent | 79143ccfc158ec4fffc49eee600d600edb342b16 (diff) | |
download | qtwebkit-beaeeb99881184fd368c121fcbb1a31c78b794a3.tar.gz |
Merge remote-tracking branch 'origin/5.212' into dev
Change-Id: I9e64176fe95183acf5e093aa081b0a498795bdb2
Diffstat (limited to 'Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp')
-rw-r--r-- | Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp b/Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp index d4afa40e7..8263aa17f 100644 --- a/Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp +++ b/Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp @@ -36,8 +36,10 @@ QWEBKITWIDGETS_EXPORT void initializeWebKitWidgets() if (initialized) return; - setWebKitWidgetsInitCallback(QStyleFacadeImp::create); - initializeWebKitQt(); + if (qgetenv("QT_WEBKIT_THEME_NAME") != "mobile") { + setWebKitWidgetsInitCallback(QStyleFacadeImp::create); + initializeWebKitQt(); + } // QWebSettings::SearchCancelButtonGraphic setImagePlatformResource("searchCancelButton", QApplication::style()->standardPixmap(QStyle::SP_DialogCloseButton)); |