3 files changed, 13 insertions, 9 deletions
diff --git a/Tools/DumpRenderTree/qt/DumpRenderTree.pro b/Tools/DumpRenderTree/qt/DumpRenderTree.pro
index e8831a3..a7c6c26 100644
--- a/Tools/DumpRenderTree/qt/DumpRenderTree.pro
+++ b/Tools/DumpRenderTree/qt/DumpRenderTree.pro
@@ -6,9 +6,9 @@ BASEDIR = $$PWD/../
 isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../..
 
 include(../../../WebKit.pri)
-INCLUDEPATH += ../../..
-INCLUDEPATH += ../../../JavaScriptCore
-INCLUDEPATH += ../../../JavaScriptCore/ForwardingHeaders
+INCLUDEPATH += ../../../Source
+INCLUDEPATH += ../../../Source/JavaScriptCore
+INCLUDEPATH += ../../../Source/JavaScriptCore/ForwardingHeaders
 INCLUDEPATH += $$BASEDIR
 DESTDIR = ../../../bin
 
@@ -29,7 +29,7 @@ HEADERS = $$BASEDIR/WorkQueue.h \
     GCControllerQt.h \
     PlainTextControllerQt.h \
     testplugin.h
-SOURCES = ../../../JavaScriptCore/wtf/Assertions.cpp \
+SOURCES = ../../../Source/JavaScriptCore/wtf/Assertions.cpp \
     $$BASEDIR/WorkQueue.cpp \
     DumpRenderTreeQt.cpp \
     EventSenderQt.cpp \
@@ -50,4 +50,4 @@ wince*: {
     LIBS += $$WCECOMPAT/lib/wcecompat.lib
 }
 
-DEFINES+=USE_SYSTEM_MALLOC
+DEFINES += USE_SYSTEM_MALLOC=1
diff --git a/Tools/DumpRenderTree/qt/ImageDiff.pro b/Tools/DumpRenderTree/qt/ImageDiff.pro
index 74fabf8..a218449 100644
--- a/Tools/DumpRenderTree/qt/ImageDiff.pro
+++ b/Tools/DumpRenderTree/qt/ImageDiff.pro
@@ -3,7 +3,7 @@ CONFIG  -= app_bundle
 
 isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../..
 include(../../../WebKit.pri)
-INCLUDEPATH += ../../../JavaScriptCore
+INCLUDEPATH += ../../../Source/JavaScriptCore
 DESTDIR = $$OUTPUT_DIR/bin
 
 QT = core gui
diff --git a/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro b/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
index de3cf6a..6f96d0a 100644
--- a/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
+++ b/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
@@ -18,11 +18,11 @@ mac {
     debug_and_release:TARGET = $$qtLibraryTarget($$TARGET)
 }
 
-INCLUDEPATH += ../../../../JavaScriptCore \
+INCLUDEPATH += ../../../../Source/JavaScriptCore \
                ../../unix/TestNetscapePlugin/ForwardingHeaders \
                ../../unix/TestNetscapePlugin/ForwardingHeaders/WebKit \
-               ../../../../WebCore \
-               ../../../../WebCore/bridge \
+               ../../../../Source/WebCore \
+               ../../../../Source/WebCore/bridge \
                ../../TestNetscapePlugIn
 
 SOURCES = PluginObject.cpp \
@@ -44,3 +44,7 @@ mac {
 } else {
     SOURCES += ../../unix/TestNetscapePlugin/TestNetscapePlugin.cpp
 }
+
+!win32:!embedded:!mac:!symbian {
+    LIBS += -lX11
+}