Title: [125023] trunk/Tools
- Revision
- 125023
- Author
- [email protected]
- Date
- 2012-08-08 05:33:16 -0700 (Wed, 08 Aug 2012)
Log Message
[Qt][Win] Fix compilation of DumpRenderTree
https://bugs.webkit.org/show_bug.cgi?id=93461
Patch by Simon Hausmann <[email protected]> on 2012-08-08
Reviewed by Tor Arne Vestbø.
DRT includes stdint.h, for which we have wrappers in Source/_javascript_Core/os-win32. Use these not only
for libraries but any building template.
* qmake/mkspecs/features/default_post.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (125022 => 125023)
--- trunk/Tools/ChangeLog 2012-08-08 12:11:23 UTC (rev 125022)
+++ trunk/Tools/ChangeLog 2012-08-08 12:33:16 UTC (rev 125023)
@@ -1,3 +1,15 @@
+2012-08-08 Simon Hausmann <[email protected]>
+
+ [Qt][Win] Fix compilation of DumpRenderTree
+ https://bugs.webkit.org/show_bug.cgi?id=93461
+
+ Reviewed by Tor Arne Vestbø.
+
+ DRT includes stdint.h, for which we have wrappers in Source/_javascript_Core/os-win32. Use these not only
+ for libraries but any building template.
+
+ * qmake/mkspecs/features/default_post.prf:
+
2012-08-08 Mikhail Pozdnyakov <[email protected]>
[WK2] [WTR] Refactoring: LayoutTestController::shouldDumpProgressFinishedCallback() should be const
Modified: trunk/Tools/qmake/mkspecs/features/default_post.prf (125022 => 125023)
--- trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-08-08 12:11:23 UTC (rev 125022)
+++ trunk/Tools/qmake/mkspecs/features/default_post.prf 2012-08-08 12:33:16 UTC (rev 125023)
@@ -137,14 +137,15 @@
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
}
}
+# For anyone trying to include stdint.h
+win32-msvc*|win32-icc: INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/_javascript_Core/os-win32
+
contains(QT, webkit) {
# In addition to the main shared QtWebKit library we also
# need to link to any intermediate shared libraries.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
