SVN commit 13096 by adridg: Merge from trunk (which in turn is a merge from ports)
_M . (directory) M +3 -2 QT/Mk/bsd.qt.mk M +1 -1 QT/devel/qt4-corelib/Makefile M +1 -0 QT/devel/qt5-core/Makefile M +2 -0 QT/www/webkit-qt5/Makefile A QT/www/webkit-qt5/files/patch-Source_WebCore_platform_leveldb_LevelDBDatabase.cpp trunk/area51/QT/www/webkit-qt5/files/patch-Source_WebCore_platform_leveldb_LevelDBDatabase.cpp#13095 A QT/www/webkit-qt5/files/patch-Tools_qmake_config.tests_glx_glx.pro trunk/area51/QT/www/webkit-qt5/files/patch-Tools_qmake_config.tests_glx_glx.pro#13095 A QT/www/webkit-qt5/files/patch-Tools_qmake_config.tests_leveldb_leveldb.cpp trunk/area51/QT/www/webkit-qt5/files/patch-Tools_qmake_config.tests_leveldb_leveldb.cpp#13095 A QT/www/webkit-qt5/files/patch-Tools_qmake_config.tests_leveldb_leveldb.pro trunk/area51/QT/www/webkit-qt5/files/patch-Tools_qmake_config.tests_leveldb_leveldb.pro#13095 A QT/www/webkit-qt5/files/patch-Tools_qmake_config.tests_libXcomposite_libXcomposite.pro trunk/area51/QT/www/webkit-qt5/files/patch-Tools_qmake_config.tests_libXcomposite_libXcomposite.pro#13095 A QT/www/webkit-qt5/files/patch-Tools_qmake_config.tests_libXrender_libXrender.pro trunk/area51/QT/www/webkit-qt5/files/patch-Tools_qmake_config.tests_libXrender_libXrender.pro#13095
