Changeset 125411 in webkit
- Timestamp:
- Aug 13, 2012 5:07:36 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r125410 r125411 1 2012-08-13 Kwang Yul Seo <skyul@company100.net> 2 3 [Qt] Add gprof.prf to build WebKit with gprof enabled 4 https://bugs.webkit.org/show_bug.cgi?id=90283 5 6 Reviewed by Eric Seidel. 7 8 No behavior change, so no new tests. 9 10 * WebCore.pri: 11 -ffunction-sections conflicts with -pg option, so don't use 12 -ffunction-sections option when gprof is enabled. 13 1 14 2012-08-13 Zan Dobersek <zandobersek@gmail.com> 2 15 -
trunk/Source/WebCore/WebCore.pri
r124904 r125411 260 260 } 261 261 262 unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections 262 # -ffunction-section conflicts with -pg option 263 !contains(CONFIG, gprof) { 264 unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections 265 } 266 unix:!mac:*-g++*:QMAKE_CXXFLAGS += -fdata-sections 263 267 unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections 264 268 linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF -
trunk/Source/WebKit/qt/ChangeLog
r125377 r125411 1 2012-08-13 Kwang Yul Seo <skyul@company100.net> 2 3 [Qt] Add gprof.prf to build WebKit with gprof enabled 4 https://bugs.webkit.org/show_bug.cgi?id=90283 5 6 Reviewed by Eric Seidel. 7 8 * tests/MIMESniffing/MIMESniffing.pro: 9 Don't build MIMESniffing.cpp because MIMESniffing test links 10 WebKitQt statically when gprof is enabled. 11 1 12 2012-08-12 Loïc Yhuel <loic.yhuel@softathome.com> 2 13 -
trunk/Source/WebKit/qt/tests/MIMESniffing/MIMESniffing.pro
r111504 r125411 3 3 CONFIG += console 4 4 5 SOURCES += ../../../../WebCore/platform/network/MIMESniffing.cpp 5 !contains(CONFIG, gprof) { 6 SOURCES += ../../../../WebCore/platform/network/MIMESniffing.cpp 7 } 8 6 9 HEADERS += \ 7 10 ../../../../WebCore/platform/network/MIMESniffing.h \ -
trunk/Tools/ChangeLog
r125401 r125411 1 2012-08-13 Kwang Yul Seo <skyul@company100.net> 2 3 [Qt] Add gprof.prf to build WebKit with gprof enabled 4 https://bugs.webkit.org/show_bug.cgi?id=90283 5 6 Reviewed by Eric Seidel. 7 8 * qmake/mkspecs/features/functions.prf: 9 gprof does not support profiling a shared library. 10 To profile WebKit, applications must link QtWebKit statically. 11 12 * qmake/mkspecs/features/gprof.prf: Added. 13 Add -pg option to both QMAKE_CXXFLAGS and QMAKE_LFLAGS. 14 1 15 2012-08-13 KwangYong Choi <ky0.choi@samsung.com> 2 16 -
trunk/Tools/qmake/mkspecs/features/functions.prf
r124879 r125411 261 261 } 262 262 263 # The following line is to prevent qmake from adding jscore to libQtWebKit's prl dependencies. 264 # The compromise we have to accept by disabling explicitlib is to drop support to link QtWebKit 265 # statically in applications (which isn't used often because, among other things, of licensing obstacles). 266 CONFIG -= explicitlib 267 CONFIG -= staticlib 263 # gprof does not support profiling a shared library. 264 # To profile WebKit, applications must link QtWebKit statically. 265 !contains(CONFIG, gprof) { 266 # The following line is to prevent qmake from adding jscore to libQtWebKit's prl dependencies. 267 # The compromise we have to accept by disabling explicitlib is to drop support to link QtWebKit 268 # statically in applications (which isn't used often because, among other things, of licensing obstacles). 269 CONFIG -= explicitlib 270 CONFIG -= staticlib 271 } 268 272 } 269 273
Note: See TracChangeset
for help on using the changeset viewer.