diff options
3 files changed, 2 insertions, 7 deletions
diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro index 1000eeef1..e8ac901f1 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro +++ b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro @@ -1,7 +1,7 @@ include(../tests.pri) SOURCES += tst_qmltests.cpp TARGET = tst_qmltests_DesktopBehavior -OBJECTS_DIR = obj_DesktopBehavior/$$activeBuildConfig() +OBJECTS_DIR = .obj_DesktopBehavior QT += webkit-private CONFIG += testcase diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro index a6196398d..6c67da96e 100644 --- a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro +++ b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro @@ -1,7 +1,7 @@ include(../tests.pri) SOURCES += tst_qmltests.cpp TARGET = tst_qmltests_WebView -OBJECTS_DIR = obj_WebView/$$activeBuildConfig() +OBJECTS_DIR = .obj_WebView QT += webkit-private CONFIG += testcase diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf index c3aaff4da..6b19a67b9 100644 --- a/Tools/qmake/mkspecs/features/default_pre.prf +++ b/Tools/qmake/mkspecs/features/default_pre.prf @@ -62,11 +62,6 @@ TAB = $$escape_expand(\\t) MAKEFILE_NOOP_COMMAND = @echo -n win32-msvc*: MAKEFILE_NOOP_COMMAND = @echo >NUL -# Help keep the build tree clean -MOC_DIR = moc -RCC_DIR = rcc -OBJECTS_DIR = obj/$$activeBuildConfig() - # Set up a default python version scratchbox: PYTHON = python2.6 else: PYTHON = python |