Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into master...
authorPulse Build System <qt-info@nokia.com>
Fri, 22 Jan 2010 01:08:17 +0000 (02:08 +0100)
committerPulse Build System <qt-info@nokia.com>
Fri, 22 Jan 2010 01:08:17 +0000 (02:08 +0100)
commite7566980e349f163cd45e84406f69f3a5a1a1649
tree9b16c29305f70df85cee16383649618cfc8ec84b
parent8e65adce9ced8f3b1d42b938e4d65e1af4768c33
parenta4de5dc69634b90b2fc6c8bd65d936fe80a5afd9
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration

* 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fixed the host detection in qmake profiles.
  Improving parts of commit 2d8d855d.
  qmake: add Linux host support to Symbian generator
  Fixed indentation.
  Add Linux host support to Symbian mkspecs.
  Linux support for platform specific commands in .pro files.
  Add createpackage.bat equivalent for Unix systems.
  Make all Symbian #includes lower case.
  mkspecs: fix warning when calling qmake
  Fix portability problems in bin/createpackage.pl.
bin/createpackage.pl
qmake/generators/makefile.cpp
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake.cpp
qmake/generators/symbian/symmake_abld.cpp
src/gui/kernel/qapplication_s60.cpp
src/gui/kernel/qdnd_s60.cpp
src/gui/kernel/qsound_s60.cpp
src/gui/styles/qs60style_s60.cpp
src/gui/text/qfontdatabase_s60.cpp
src/gui/text/qfontengine_s60_p.h