diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-02 16:52:51 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-02 16:54:00 (GMT) |
| commit | 7c09fda559760b8488d3130a5932fee04b2f6979 (patch) | |
| tree | 5c28256d698f3f98edf42ea82ee504fb600a72bb | |
| parent | 6a75563240adf2662a1fd5b931801513c099fb16 (diff) | |
| download | Qt-7c09fda559760b8488d3130a5932fee04b2f6979.zip Qt-7c09fda559760b8488d3130a5932fee04b2f6979.tar.gz Qt-7c09fda559760b8488d3130a5932fee04b2f6979.tar.bz2 | |
Make mkdist-webkit work from in-source builds
Explicitly unset QTDIR_build, to make sure we generate Makefiles with
real rules to call the extra tools.
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
| -rwxr-xr-x | util/webkit/mkdist-webkit | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/webkit/mkdist-webkit b/util/webkit/mkdist-webkit index 0644564..d4e6d9e 100755 --- a/util/webkit/mkdist-webkit +++ b/util/webkit/mkdist-webkit @@ -254,7 +254,7 @@ echo "generating extra sources" mkdir tmp && cd tmp && mkdir -p ../generated && - qmake -o Makefile QT_CONFIG+=phonon GENERATED_SOURCES_DIR=`pwd`/../generated OUTPUT_DIR=`pwd` ../$proj.pro && + qmake -o Makefile CONFIG-=QTDIR_build QT_CONFIG+=phonon GENERATED_SOURCES_DIR=`pwd`/../generated OUTPUT_DIR=`pwd` ../$proj.pro && make generated_files && perl -pi -e "s,$absSrcDir/,,g" ../generated/*.cpp ../generated/*.h && git add ../generated && |