Title: [99701] trunk
- Revision
- 99701
- Author
- [email protected]
- Date
- 2011-11-09 06:40:04 -0800 (Wed, 09 Nov 2011)
Log Message
Source/WebKit/qt: [Qt] Enable exports and constructor functions in static libs
Reviewed by Tor Arne Vestbø.
* Api/qwebpage.cpp:
(QWebPagePrivate::QWebPagePrivate): Remove unnecessary manual Qt resource
initialization.
Source/WebKit2: [Qt] Enable exports and constructor functions in static libs
Reviewed by Tor Arne Vestbø.
* WebProcess/WebPage/qt/WebPageQt.cpp:
(WebKit::WebPage::platformInitialize): Remove unnecessary manual Qt resource
initialization.
Tools: [Qt] Enable exports and constructor functions in static libs
Reviewed by Tor Arne Vestbø.
* qmake/mkspecs/features/functions.prf: Use --whole-archive and their
mac/win32-msvc equivalents when linking static libraries into a shared
library or executable.
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/Api/qwebpage.cpp (99700 => 99701)
--- trunk/Source/WebKit/qt/Api/qwebpage.cpp 2011-11-09 14:07:24 UTC (rev 99700)
+++ trunk/Source/WebKit/qt/Api/qwebpage.cpp 2011-11-09 14:40:04 UTC (rev 99701)
@@ -292,17 +292,6 @@
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)
@@ -327,7 +316,6 @@
, inspectorIsInternalOnly(false)
, m_lastDropAction(Qt::IgnoreAction)
{
- initResources();
WebCore::InitializeLoggingChannelsIfNecessary();
ScriptController::initializeThreading();
WTF::initializeMainThread();
Modified: trunk/Source/WebKit/qt/ChangeLog (99700 => 99701)
--- trunk/Source/WebKit/qt/ChangeLog 2011-11-09 14:07:24 UTC (rev 99700)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-11-09 14:40:04 UTC (rev 99701)
@@ -1,3 +1,13 @@
+2011-11-09 Simon Hausmann <[email protected]>
+
+ [Qt] Enable exports and constructor functions in static libs
+
+ Reviewed by Tor Arne Vestbø.
+
+ * Api/qwebpage.cpp:
+ (QWebPagePrivate::QWebPagePrivate): Remove unnecessary manual Qt resource
+ initialization.
+
2011-11-09 Deepak Sherveghar <[email protected]>
[Qt] 4 Layout test fail due to network error constant values clash with WebkitError enum values in FrameloaderclientQt
Modified: trunk/Source/WebKit2/ChangeLog (99700 => 99701)
--- trunk/Source/WebKit2/ChangeLog 2011-11-09 14:07:24 UTC (rev 99700)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-09 14:40:04 UTC (rev 99701)
@@ -1,5 +1,15 @@
2011-11-09 Simon Hausmann <[email protected]>
+ [Qt] Enable exports and constructor functions in static libs
+
+ Reviewed by Tor Arne Vestbø.
+
+ * WebProcess/WebPage/qt/WebPageQt.cpp:
+ (WebKit::WebPage::platformInitialize): Remove unnecessary manual Qt resource
+ initialization.
+
+2011-11-09 Simon Hausmann <[email protected]>
+
[Qt] Fix geolocation enabled build.
Reviewed by Tor Arne Vestbø.
Modified: trunk/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp (99700 => 99701)
--- trunk/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp 2011-11-09 14:07:24 UTC (rev 99700)
+++ trunk/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp 2011-11-09 14:40:04 UTC (rev 99701)
@@ -78,17 +78,6 @@
#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 {
@@ -99,8 +88,6 @@
// 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 (99700 => 99701)
--- trunk/Tools/ChangeLog 2011-11-09 14:07:24 UTC (rev 99700)
+++ trunk/Tools/ChangeLog 2011-11-09 14:40:04 UTC (rev 99701)
@@ -1,3 +1,13 @@
+2011-11-09 Simon Hausmann <[email protected]>
+
+ [Qt] Enable exports and constructor functions in static libs
+
+ Reviewed by Tor Arne Vestbø.
+
+ * qmake/mkspecs/features/functions.prf: Use --whole-archive and their
+ mac/win32-msvc equivalents when linking static libraries into a shared
+ library or executable.
+
2011-11-09 Philippe Normand <[email protected]>
[GTK][DRT] window internals object is not reset after each test
Modified: trunk/Tools/qmake/mkspecs/features/functions.prf (99700 => 99701)
--- trunk/Tools/qmake/mkspecs/features/functions.prf 2011-11-09 14:07:24 UTC (rev 99700)
+++ trunk/Tools/qmake/mkspecs/features/functions.prf 2011-11-09 14:40:04 UTC (rev 99701)
@@ -232,8 +232,19 @@
path = $$1
target = $$2
- LIBS = -l$$target $$LIBS
+ 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 = $$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
