Diff
Modified: trunk/Tools/ChangeLog (130264 => 130265)
--- trunk/Tools/ChangeLog 2012-10-03 08:54:28 UTC (rev 130264)
+++ trunk/Tools/ChangeLog 2012-10-03 09:03:44 UTC (rev 130265)
@@ -1,3 +1,20 @@
+2012-10-03 Zoltan Arvai <[email protected]>
+
+ [Qt][WRT] Fix build error with MSVC on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=97697
+
+ Reviewed by Simon Hausmann.
+
+ WTR build is failing when WebKit directory is located on a longer path.
+ This seems to caused by source files that has the same name in
+ WTR and DRT directories. The solution is removing referencies
+ from Target.pri to DRT directory and adding an alternate version of
+ the required files to WTR. Those files simply include the real ones from DRT.
+
+ * WebKitTestRunner/InjectedBundle/Target.pri:
+ * WebKitTestRunner/InjectedBundle/qt/QtInitializeTestFonts.cpp: Added.
+ * WebKitTestRunner/InjectedBundle/qt/QtInitializeTestFonts.h: Added.
+
2012-10-03 Christophe Dumez <[email protected]>
[WK2][WKTR] TestRunner.setAlwaysAcceptCookies() causes flakiness
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri (130264 => 130265)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2012-10-03 08:54:28 UTC (rev 130264)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2012-10-03 09:03:44 UTC (rev 130265)
@@ -8,7 +8,6 @@
TARGET = WTRInjectedBundle
SOURCES += \
- $${ROOT_WEBKIT_DIR}/Tools/DumpRenderTree/qt/QtInitializeTestFonts.cpp \
AccessibilityController.cpp \
AccessibilityTextMarker.cpp \
AccessibilityTextMarkerRange.cpp \
@@ -29,13 +28,13 @@
Bindings/JSWrapper.cpp \
qt/ActivateFontsQt.cpp \
qt/InjectedBundleQt.cpp \
+ qt/QtInitializeTestFonts.cpp \
qt/TestRunnerQt.cpp
# Adds the generated sources to SOURCES
include(DerivedSources.pri)
HEADERS += \
- $${ROOT_WEBKIT_DIR}/Tools/DumpRenderTree/qt/QtInitializeTestFonts.h \
AccessibilityController.h \
AccessibilityTextMarker.h \
AccessibilityTextMarkerRange.h \
@@ -47,6 +46,7 @@
InjectedBundlePage.h \
TestRunner.h \
TextInputController.h \
+ qt/QtInitializeTestFonts.h
DESTDIR = $${ROOT_BUILD_DIR}/lib
@@ -63,8 +63,7 @@
$$PWD/.. \
$$PWD/Bindings \
$${ROOT_WEBKIT_DIR}/Source/WebCore/testing/js \
- $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/WebCoreSupport \
- $${ROOT_WEBKIT_DIR}/Tools/DumpRenderTree/qt
+ $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/WebCoreSupport
PREFIX_HEADER = $$PWD/../WebKitTestRunnerPrefix.h
*-g++*:QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER"
Added: trunk/Tools/WebKitTestRunner/InjectedBundle/qt/QtInitializeTestFonts.cpp (0 => 130265)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/qt/QtInitializeTestFonts.cpp (rev 0)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/qt/QtInitializeTestFonts.cpp 2012-10-03 09:03:44 UTC (rev 130265)
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "../../../DumpRenderTree/qt/QtInitializeTestFonts.cpp"
+
Added: trunk/Tools/WebKitTestRunner/InjectedBundle/qt/QtInitializeTestFonts.h (0 => 130265)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/qt/QtInitializeTestFonts.h (rev 0)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/qt/QtInitializeTestFonts.h 2012-10-03 09:03:44 UTC (rev 130265)
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "../../../DumpRenderTree/qt/QtInitializeTestFonts.h"
+
