Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master
authoraxis <qt-info@nokia.com>
Mon, 31 Jan 2011 11:37:19 +0000 (12:37 +0100)
committeraxis <qt-info@nokia.com>
Mon, 31 Jan 2011 11:37:19 +0000 (12:37 +0100)
commit5cd39cd8a70be4c22164fe060ad64a1d9108bf41
tree4b072c7d4e4d717fe8f0977dd2108837ac71f7c3
parentc40ae86025856225e74289249ecc509bf61dc9ba
parent9c132451acc7fbed1611fd3676cceb26e815f50d
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master
18 files changed:
doc/src/development/qmake-manual.qdoc
doc/src/snippets/code/doc_src_qmake-manual.qdoc
mkspecs/common/symbian/symbian-makefile.conf
mkspecs/common/symbian/symbian.conf
mkspecs/win32-g++/qmake.conf
qmake/generators/metamakefile.cpp
qmake/generators/symbian/symbiancommon.cpp
qmake/generators/win32/mingw_make.cpp
qmake/generators/win32/mingw_make.h
qmake/generators/win32/winmakefile.cpp
qmake/generators/win32/winmakefile.h
src/corelib/io/qfilesystemengine.cpp
src/corelib/kernel/qobject.h
src/gui/kernel/qapplication_s60.cpp
src/gui/kernel/qkeymapper_p.h
src/gui/kernel/qkeymapper_s60.cpp
src/network/kernel/qnetworkinterface_symbian.cpp
tools/runonphone/main.cpp