Diff
Modified: trunk/ChangeLog (100440 => 100441)
--- trunk/ChangeLog 2011-11-16 14:17:24 UTC (rev 100440)
+++ trunk/ChangeLog 2011-11-16 14:20:33 UTC (rev 100441)
@@ -1,3 +1,11 @@
+2011-11-15 Simon Hausmann <[email protected]>
+
+ [Qt] Centralize hide_symbols and ensure all libs are built with symbol visibility & bsymbolic_functions
+
+ Reviewed by Tor Arne Vestbø.
+
+ * Source/api.pri: Eliminate duplicated symbol stuff that lives now in default_post.prf.
+
2011-11-16 Tor Arne Vestbø <[email protected]>
Fix path to module file in root project file
Modified: trunk/Source/_javascript_Core/ChangeLog (100440 => 100441)
--- trunk/Source/_javascript_Core/ChangeLog 2011-11-16 14:17:24 UTC (rev 100440)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-11-16 14:20:33 UTC (rev 100441)
@@ -1,3 +1,11 @@
+2011-11-15 Simon Hausmann <[email protected]>
+
+ [Qt] Centralize hide_symbols and ensure all libs are built with symbol visibility & bsymbolic_functions
+
+ Reviewed by Tor Arne Vestbø.
+
+ * Target.pri: Eliminate duplicated symbol stuff that lives now in default_post.prf.
+
2011-11-16 Simon Hausmann <[email protected]>
Unreviewed, rolling out r100266.
Modified: trunk/Source/_javascript_Core/Target.pri (100440 => 100441)
--- trunk/Source/_javascript_Core/Target.pri 2011-11-16 14:17:24 UTC (rev 100440)
+++ trunk/Source/_javascript_Core/Target.pri 2011-11-16 14:20:33 UTC (rev 100441)
@@ -20,9 +20,6 @@
QT += core
QT -= gui
-contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
-unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
-
*-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
*-g++*:QMAKE_CXXFLAGS_RELEASE += -O3
Modified: trunk/Source/WebCore/ChangeLog (100440 => 100441)
--- trunk/Source/WebCore/ChangeLog 2011-11-16 14:17:24 UTC (rev 100440)
+++ trunk/Source/WebCore/ChangeLog 2011-11-16 14:20:33 UTC (rev 100441)
@@ -1,3 +1,11 @@
+2011-11-15 Simon Hausmann <[email protected]>
+
+ [Qt] Centralize hide_symbols and ensure all libs are built with symbol visibility & bsymbolic_functions
+
+ Reviewed by Tor Arne Vestbø.
+
+ * Target.pri: Eliminate duplicated symbol stuff that lives now in default_post.prf.
+
2011-11-16 Iain Merrick <[email protected]>
[chromium] Pass screen refresh rate into compositor.
Modified: trunk/Source/WebCore/Target.pri (100440 => 100441)
--- trunk/Source/WebCore/Target.pri 2011-11-16 14:17:24 UTC (rev 100440)
+++ trunk/Source/WebCore/Target.pri 2011-11-16 14:20:33 UTC (rev 100441)
@@ -18,8 +18,6 @@
DEFINES += QT_MAKEDLL
-contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
-
haveQt(5) {
# Add a QtScript dependency for the time being, in order to pull in the include
# path for QtScript when it's built as a standalone module
Modified: trunk/Source/api.pri (100440 => 100441)
--- trunk/Source/api.pri 2011-11-16 14:17:24 UTC (rev 100440)
+++ trunk/Source/api.pri 2011-11-16 14:20:33 UTC (rev 100441)
@@ -35,11 +35,6 @@
contains(DEFINES, ENABLE_WEBGL=1)|contains(CONFIG, texmap): LIBS += $$QMAKE_LIBS_OPENGL
}
-CONFIG(release) {
- contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
- unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
-}
-
!static: DEFINES += QT_MAKEDLL
SOURCES += \
Modified: trunk/Tools/ChangeLog (100440 => 100441)
--- trunk/Tools/ChangeLog 2011-11-16 14:17:24 UTC (rev 100440)
+++ trunk/Tools/ChangeLog 2011-11-16 14:20:33 UTC (rev 100441)
@@ -1,3 +1,14 @@
+2011-11-15 Simon Hausmann <[email protected]>
+
+ [Qt] Centralize hide_symbols and ensure all libs are built with symbol visibility & bsymbolic_functions
+
+ Reviewed by Tor Arne Vestbø.
+
+ * qmake/mkspecs/features/default_post.prf: Place the common hide_symbols and -Bsymbolic-functions
+ magic here where we handle all TEMPLATE = lib .pro files (except plugins).
+ * WebKitTestRunner/InjectedBundle/Target.pri: Mark the injected bundle as plugin, which also
+ removes the .so.0.0.0 and just produces .so.
+
2011-11-16 Peter Beverloo <[email protected]>
Explicitly include unistd.h in TestNetscapePlugIn
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri (100440 => 100441)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2011-11-16 14:17:24 UTC (rev 100440)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2011-11-16 14:20:33 UTC (rev 100441)
@@ -47,7 +47,7 @@
load(features)
load(webcore)
-CONFIG += _javascript_core qtwebkit
+CONFIG += plugin _javascript_core qtwebkit
INCLUDEPATH += \
$$PWD/.. \
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (100440 => 100441)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2011-11-16 14:17:24 UTC (rev 100440)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2011-11-16 14:20:33 UTC (rev 100441)
@@ -130,6 +130,11 @@
DEFINES += QT_ASCII_CAST_WARNINGS
win32-msvc*|win32-icc: INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/_javascript_Core/os-win32
+
+ !plugin {
+ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
+ unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
+ }
}
equals(_PRO_FILE_, $${ROOT_WEBKIT_DIR}/WebKit.pro):!isEmpty(OVERRIDE_SUBDIRS) {
