diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-06 15:43:39 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-17 14:00:26 +0100 |
| commit | fc3a6d84a79b606864d6e76b4fb8e1edc8ab92cb (patch) | |
| tree | db648741b5b4777d3c316ade0466640691a21d4b | |
| parent | 7c4193b031c199c7f614faf4ebf2d67a79e6d80a (diff) | |
rely on automatic output directory setupv5.0.0
now being a proper qt module (by virtue of having load(qt_build_config)
in .qmake.conf), webkit gets the path setup goodies for free.
Change-Id: Ief00d234b0b21a136f5736e7f18440d63b1a8857
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
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 |