diff options
| author | vestbo@webkit.org <vestbo@webkit.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2012-10-22 08:43:56 +0000 |
|---|---|---|
| committer | vestbo@webkit.org <vestbo@webkit.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2012-10-22 08:43:56 +0000 |
| commit | 953165287065ece5e0da64b9116e26c514b35fd5 (patch) | |
| tree | 069884c191f0e38dc0fe1c97f94790aa1e94d107 /third_party/WebKit/Tools/qmake | |
| parent | d4a53c6fb7ef561e7747b8ca35d9c405d8da33da (diff) | |
| download | chromium_src-953165287065ece5e0da64b9116e26c514b35fd5.zip chromium_src-953165287065ece5e0da64b9116e26c514b35fd5.tar.gz chromium_src-953165287065ece5e0da64b9116e26c514b35fd5.tar.bz2 | |
[Qt] Move OBJECTS_DIR and friends to default_pre.prf
The introduction of load(qt_build_config) in .qmake.conf meant
that we started loading qtmodule.pri, which in turn set both
MOC_DIR, RCC_DIR, and OBJECTS_DIR.
We were setting OBJECTS_DIR in default_post under a isEmpty() guard
so that project files could override the objects dir. Instead of
using the isEmpty() check we move it to defaul_pre, which will
override the qtmodule.pri settings, but still allow project files
to override it.
Reviewed by Ossy.
git-svn-id: svn://svn.chromium.org/blink/trunk@132042 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Diffstat (limited to 'third_party/WebKit/Tools/qmake')
| -rw-r--r-- | third_party/WebKit/Tools/qmake/mkspecs/features/default_post.prf | 5 | ||||
| -rw-r--r-- | third_party/WebKit/Tools/qmake/mkspecs/features/default_pre.prf | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/third_party/WebKit/Tools/qmake/mkspecs/features/default_post.prf b/third_party/WebKit/Tools/qmake/mkspecs/features/default_post.prf index 8800e1e..ccae00f 100644 --- a/third_party/WebKit/Tools/qmake/mkspecs/features/default_post.prf +++ b/third_party/WebKit/Tools/qmake/mkspecs/features/default_post.prf @@ -28,11 +28,6 @@ root_project_file: finalizeConfigure() } } -# Help keep the build tree clean -MOC_DIR = moc -RCC_DIR = rcc -isEmpty(OBJECTS_DIR): OBJECTS_DIR = obj/$$activeBuildConfig() - # General default build tweaks DEFINES += \ BUILDING_QT__=1 diff --git a/third_party/WebKit/Tools/qmake/mkspecs/features/default_pre.prf b/third_party/WebKit/Tools/qmake/mkspecs/features/default_pre.prf index a9cccb8..46b66af 100644 --- a/third_party/WebKit/Tools/qmake/mkspecs/features/default_pre.prf +++ b/third_party/WebKit/Tools/qmake/mkspecs/features/default_pre.prf @@ -69,6 +69,11 @@ 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 |