Title: [99712] trunk
- Revision
- 99712
- Author
- [email protected]
- Date
- 2011-11-09 07:12:58 -0800 (Wed, 09 Nov 2011)
Log Message
Unreviewed, rolling out r99701.
http://trac.webkit.org/changeset/99701
Breaks Qt mac build
Source/WebKit/qt:
* Api/qwebpage.cpp:
(initResources):
(QWebPagePrivate::QWebPagePrivate):
Source/WebKit2:
* WebProcess/WebPage/qt/WebPageQt.cpp:
(initResources):
(WebKit::WebPage::platformInitialize):
Tools:
* qmake/mkspecs/features/functions.prf:
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/Api/qwebpage.cpp (99711 => 99712)
--- trunk/Source/WebKit/qt/Api/qwebpage.cpp 2011-11-09 15:10:09 UTC (rev 99711)
+++ trunk/Source/WebKit/qt/Api/qwebpage.cpp 2011-11-09 15:12:58 UTC (rev 99712)
@@ -292,6 +292,17 @@
return result;
}
+static void initResources()
+{
+ static bool initialized = false;
+ if (initialized)
+ return;
+ Q_INIT_RESOURCE(WebKit);
+ Q_INIT_RESOURCE(WebCore);
+ Q_INIT_RESOURCE(InspectorBackendStub);
+ initialized = true;
+}
+
QWebPagePrivate::QWebPagePrivate(QWebPage *qq)
: q(qq)
, page(0)
@@ -316,6 +327,7 @@
, inspectorIsInternalOnly(false)
, m_lastDropAction(Qt::IgnoreAction)
{
+ initResources();
WebCore::InitializeLoggingChannelsIfNecessary();
ScriptController::initializeThreading();
WTF::initializeMainThread();
Modified: trunk/Source/WebKit/qt/ChangeLog (99711 => 99712)
--- trunk/Source/WebKit/qt/ChangeLog 2011-11-09 15:10:09 UTC (rev 99711)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-11-09 15:12:58 UTC (rev 99712)
@@ -1,5 +1,16 @@
2011-11-09 Simon Hausmann <[email protected]>
+ Unreviewed, rolling out r99701.
+ http://trac.webkit.org/changeset/99701
+
+ Breaks Qt mac build
+
+ * Api/qwebpage.cpp:
+ (initResources):
+ (QWebPagePrivate::QWebPagePrivate):
+
+2011-11-09 Simon Hausmann <[email protected]>
+
[Qt] Enable exports and constructor functions in static libs
Reviewed by Tor Arne Vestbø.
Modified: trunk/Source/WebKit2/ChangeLog (99711 => 99712)
--- trunk/Source/WebKit2/ChangeLog 2011-11-09 15:10:09 UTC (rev 99711)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-09 15:12:58 UTC (rev 99712)
@@ -1,5 +1,16 @@
2011-11-09 Simon Hausmann <[email protected]>
+ Unreviewed, rolling out r99701.
+ http://trac.webkit.org/changeset/99701
+
+ Breaks Qt mac build
+
+ * WebProcess/WebPage/qt/WebPageQt.cpp:
+ (initResources):
+ (WebKit::WebPage::platformInitialize):
+
+2011-11-09 Simon Hausmann <[email protected]>
+
[Qt] Enable exports and constructor functions in static libs
Reviewed by Tor Arne Vestbø.
Modified: trunk/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp (99711 => 99712)
--- trunk/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp 2011-11-09 15:10:09 UTC (rev 99711)
+++ trunk/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp 2011-11-09 15:12:58 UTC (rev 99712)
@@ -78,6 +78,17 @@
#define VK_OEM_PERIOD 0xBE
#endif
+static void initResources()
+{
+ static bool initialized = false;
+ if (initialized)
+ return;
+ Q_INIT_RESOURCE(WebKit);
+ Q_INIT_RESOURCE(WebCore);
+ Q_INIT_RESOURCE(InspectorBackendStub);
+ initialized = true;
+}
+
using namespace WebCore;
namespace WebKit {
@@ -88,6 +99,8 @@
// If accelerated compositing is enabled, we want to be in force-compositing mode, so that we don't switch between composited/non-composited state.
settings->setForceCompositingMode(true);
+
+ initResources();
}
void WebPage::platformPreferencesDidChange(const WebPreferencesStore&)
Modified: trunk/Tools/ChangeLog (99711 => 99712)
--- trunk/Tools/ChangeLog 2011-11-09 15:10:09 UTC (rev 99711)
+++ trunk/Tools/ChangeLog 2011-11-09 15:12:58 UTC (rev 99712)
@@ -1,5 +1,14 @@
2011-11-09 Simon Hausmann <[email protected]>
+ Unreviewed, rolling out r99701.
+ http://trac.webkit.org/changeset/99701
+
+ Breaks Qt mac build
+
+ * qmake/mkspecs/features/functions.prf:
+
+2011-11-09 Simon Hausmann <[email protected]>
+
[Qt] Prospective build fix for Win32/Mac with xmlpatterns
Reviewed by Tor Arne Vestbø.
Modified: trunk/Tools/qmake/mkspecs/features/functions.prf (99711 => 99712)
--- trunk/Tools/qmake/mkspecs/features/functions.prf 2011-11-09 15:10:09 UTC (rev 99711)
+++ trunk/Tools/qmake/mkspecs/features/functions.prf 2011-11-09 15:12:58 UTC (rev 99712)
@@ -232,19 +232,8 @@
path = $$1
target = $$2
- mac {
- wholeArchivePreFlag = -Wl,-all_load
- wholeArchivePostFlag = -Wl,-noall_load
- } else:win32-msvc*|wince*|win32-icc {
- wholeArchivePreFlag = /OPT:REF
- wholeArchivePostFlag =
- } else {
- wholeArchivePreFlag = -Wl,-whole-archive
- wholeArchivePostFlag = -Wl,-no-whole-archive
- }
+ LIBS = -l$$target $$LIBS
- LIBS = $$wholeArchivePreFlag -l$$target $$wholeArchivePostFlag $$LIBS
-
win32-msvc*|wince*|win32-icc {
LIBS = -L$$path $$LIBS
POST_TARGETDEPS += $${path}$${QMAKE_DIR_SEP}$${target}.lib
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
