diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-02 16:56:04 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-02 16:56:04 (GMT) |
| commit | 87d9469e428296a2fb8d0f266900cdfe816eaf0a (patch) | |
| tree | f8219cadd57c0013f619030b44068adc009e2058 /util/webkit | |
| parent | ceb253c234f840f7aeec10fa4450e840c6b242f4 (diff) | |
| parent | 7c09fda559760b8488d3130a5932fee04b2f6979 (diff) | |
| download | Qt-87d9469e428296a2fb8d0f266900cdfe816eaf0a.zip Qt-87d9469e428296a2fb8d0f266900cdfe816eaf0a.tar.gz Qt-87d9469e428296a2fb8d0f266900cdfe816eaf0a.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
tools/linguist/shared/profileevaluator.cpp
Diffstat (limited to 'util/webkit')
| -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 3b513b4..701133e 100755 --- a/util/webkit/mkdist-webkit +++ b/util/webkit/mkdist-webkit @@ -252,7 +252,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 && |