summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-08-05 10:27:26 +0200
committerSergio Ahumada <sergio.ahumada@digia.com>2013-08-05 10:27:26 +0200
commitf0ce121cf5367b340160408821ab6b9d00d3d0cb (patch)
tree940ffe0e86c783905202abaf18ff8b73c34a985f
parentc622b471181b5e4a83c5fe0fcd484d0cb2fcad62 (diff)
parent669ed590743b6c456f8b7cedab6d95a0ad845675 (diff)
downloadqtwebkit-f0ce121cf5367b340160408821ab6b9d00d3d0cb.tar.gz
Merge branch 'stable' into dev
Conflicts: .qmake.conf Change-Id: Ic3d3ef471f7b64dde6b7965d8514fc6916012c2f
-rw-r--r--Source/WebCore/ChangeLog13
-rw-r--r--Source/WebCore/WebCore.pri2
-rw-r--r--Source/WebKit/qt/WebCoreSupport/PlatformStrategiesQt.cpp2
-rw-r--r--Source/WebKit2/WebProcess.pro2
-rw-r--r--Tools/QtTestBrowser/QtTestBrowser.pro2
-rw-r--r--Tools/qmake/mkspecs/features/configure.prf4
-rw-r--r--Tools/qmake/mkspecs/features/features.prf14
-rw-r--r--Tools/qmake/mkspecs/features/functions.prf8
8 files changed, 25 insertions, 22 deletions
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 156d9c468..845bc1d97 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2013-07-30 Simon Hausmann <simon.hausmann@digia.com>
+
+ [Qt][Win] Extend disabling of whole-program-optimizations to MSVC 2012
+ https://bugs.webkit.org/show_bug.cgi?id=119238
+
+ Reviewed by Jocelyn Turcotte.
+
+ As suggested in https://bugreports.qt-project.org/browse/QTBUG-20556,
+ the WebKit build with MSVC 2012 is affected by the same size
+ limitations.
+
+ * WebCore.pri:
+
2013-01-08 Zan Dobersek <zandobersek@gmail.com>
[GTK] Build failures when building with python 3.3
diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri
index cb9452356..cc347ce4b 100644
--- a/Source/WebCore/WebCore.pri
+++ b/Source/WebCore/WebCore.pri
@@ -267,7 +267,7 @@ win32 {
}
# Remove whole program optimizations due to miscompilations
-win32-msvc2005|win32-msvc2008|win32-msvc2010|wince*:{
+win32-msvc2005|win32-msvc2008|win32-msvc2010|win32-msvc2012|wince*:{
QMAKE_CFLAGS_LTCG -= -GL
QMAKE_CXXFLAGS_LTCG -= -GL
diff --git a/Source/WebKit/qt/WebCoreSupport/PlatformStrategiesQt.cpp b/Source/WebKit/qt/WebCoreSupport/PlatformStrategiesQt.cpp
index 07e84606e..01a217449 100644
--- a/Source/WebKit/qt/WebCoreSupport/PlatformStrategiesQt.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/PlatformStrategiesQt.cpp
@@ -175,8 +175,6 @@ void PlatformStrategiesQt::getPluginInfo(const WebCore::Page* page, Vector<WebCo
PluginDatabase* db = PluginDatabase::installedPlugins();
const Vector<PluginPackage*> &plugins = db->plugins();
- outPlugins.resize(plugins.size());
-
for (int i = 0; i < plugins.size(); ++i) {
PluginInfo info;
PluginPackage* package = plugins[i];
diff --git a/Source/WebKit2/WebProcess.pro b/Source/WebKit2/WebProcess.pro
index a64f5d281..a45ec28b1 100644
--- a/Source/WebKit2/WebProcess.pro
+++ b/Source/WebKit2/WebProcess.pro
@@ -14,7 +14,7 @@ SOURCES += qt/MainQt.cpp
QT += network webkit
macx: QT += xml
-haveQtModule(widgets): QT += widgets webkitwidgets
+qtHaveModule(widgets): QT += widgets webkitwidgets
build?(webkit1): DEFINES += HAVE_WEBKIT1
diff --git a/Tools/QtTestBrowser/QtTestBrowser.pro b/Tools/QtTestBrowser/QtTestBrowser.pro
index 2fa9086d9..366d0bd5a 100644
--- a/Tools/QtTestBrowser/QtTestBrowser.pro
+++ b/Tools/QtTestBrowser/QtTestBrowser.pro
@@ -48,7 +48,7 @@ macx:QT += xml
have?(FONTCONFIG): PKGCONFIG += fontconfig
-contains(QT_CONFIG, opengl) {
+qtHaveModule(opengl) {
QT += opengl
DEFINES += QT_CONFIGURED_WITH_OPENGL
}
diff --git a/Tools/qmake/mkspecs/features/configure.prf b/Tools/qmake/mkspecs/features/configure.prf
index ac4abeb93..9d88dff39 100644
--- a/Tools/qmake/mkspecs/features/configure.prf
+++ b/Tools/qmake/mkspecs/features/configure.prf
@@ -57,7 +57,7 @@ defineTest(runConfigure) {
# to determine which pro-files to include. The remaining sanitazion
# is done when finalizing configure.
- !haveQtModule(widgets) {
+ !qtHaveModule(widgets) {
CONFIGURE_WARNINGS += "Missing QtWidgets module, disabling WebKit1"
WEBKIT_CONFIG -= build_webkit1
}
@@ -89,7 +89,7 @@ defineTest(finalizeConfigure) {
santizeFeatures()
# Sanitize build options
- !haveQtModule(testlib) {
+ !qtHaveModule(testlib) {
CONFIGURE_WARNINGS += "Missing QtTest module, disabling DumpRenderTree, WebKitTestRunner and tests"
WEBKIT_CONFIG -= build_drt build_wtr build_tests
}
diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf
index 804d8cb57..66d3b5b6a 100644
--- a/Tools/qmake/mkspecs/features/features.prf
+++ b/Tools/qmake/mkspecs/features/features.prf
@@ -30,12 +30,12 @@ defineTest(detectFeatures) {
# Please note: static feature defaults go in features.pri
#
- haveQtModule(quick): WEBKIT_CONFIG += have_qtquick
+ qtHaveModule(quick): WEBKIT_CONFIG += have_qtquick
else: CONFIGURE_WARNINGS += "QtQuick module not found, QML APIs will not be built"
- haveQtModule(printsupport): WEBKIT_CONFIG += have_qtprintsupport
- haveQtModule(widgets): WEBKIT_CONFIG += have_qstyle
- haveQtModule(testlib): WEBKIT_CONFIG += have_qttestlib
+ qtHaveModule(printsupport): WEBKIT_CONFIG += have_qtprintsupport
+ qtHaveModule(widgets): WEBKIT_CONFIG += have_qstyle
+ qtHaveModule(testlib): WEBKIT_CONFIG += have_qttestlib
config_libxml2: WEBKIT_CONFIG += use_libxml2
config_libxslt: WEBKIT_CONFIG += xslt
@@ -95,10 +95,10 @@ defineTest(detectFeatures) {
enable?(css_filters):enable?(webgl): WEBKIT_CONFIG += css_shaders
# Geolocation support if QtMobility exists
- haveQtModule(location): WEBKIT_CONFIG += geolocation
+ qtHaveModule(location): WEBKIT_CONFIG += geolocation
# Orientation support
- haveQtModule(sensors): WEBKIT_CONFIG += orientation_events device_orientation
+ qtHaveModule(sensors): WEBKIT_CONFIG += orientation_events device_orientation
# HTML5 Media Support for non-Mac builds
!mac {
@@ -111,7 +111,7 @@ defineTest(detectFeatures) {
}
}
- !enable?(video):haveQtModule(multimediawidgets) {
+ !enable?(video):qtHaveModule(multimediawidgets) {
WEBKIT_CONFIG += video use_qt_multimedia
}
diff --git a/Tools/qmake/mkspecs/features/functions.prf b/Tools/qmake/mkspecs/features/functions.prf
index b8715fef9..922ac3236 100644
--- a/Tools/qmake/mkspecs/features/functions.prf
+++ b/Tools/qmake/mkspecs/features/functions.prf
@@ -195,14 +195,6 @@ defineTest(haveQt) {
return(true)
}
-defineTest(haveQtModule) {
- unset(module)
- module = $$1
-
- haveQt(5):!isEmpty(QT.$${module}.name): return(true)
- return(false)
-}
-
defineTest(programExistsInPath) {
win32: program = $${1}.exe
else: program = $$1