Merge commit 'origin/master'

Conflicts:
	src/corelib/global/qglobal.h
	src/corelib/kernel/qmetatype.cpp
	src/corelib/kernel/qobject.cpp
	src/corelib/thread/qthread_unix.cpp
	src/gui/graphicsview/qgraphicssceneevent.h
	src/gui/itemviews/qheaderview.h
	src/gui/kernel/qapplication_qws.cpp
	src/gui/kernel/qgesture.h
	src/gui/kernel/qgesturerecognizer.h
	src/gui/painting/qpaintengine_raster.cpp
	src/network/access/qhttpnetworkreply.cpp
	src/network/access/qnetworkcookie.h
	src/network/socket/qnativesocketengine_unix.cpp

1 files changed, 4 insertions, 6 deletions

diff --git a/qmake/project.cpp b/qmake/project.cpp
index 2da2e3b..2bba765 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -3333,26 +3333,24 @@ QStringList &QMakeProject::values(const QString &_var, QMap<QString, QStringList
 
 
 // UIDs starting with 0xE are test UIDs in symbian
-QString generate_test_uid(const QString& target) {
+QString generate_test_uid(const QString& target) 
+{
     QString tmp = generate_uid(target);
     tmp.replace(0,1,"E");
     tmp.prepend("0x");
 
-    // printf("generate_test_uid for %s is %s \n", qPrintable(target), qPrintable(tmp));
-
     return tmp;
 }
 
 
 // UIDs starting with 0xE are test UIDs in symbian
-QString generate_uid(const QString& target) {
-
+QString generate_uid(const QString& target) 
+{
     static QMap<QString, QString> targetToUid;
 
     QString tmp = targetToUid[target];
 
     if(!tmp.isEmpty()) {
-        // printf("generate_uid for %s is %s \n", qPrintable(target), qPrintable(tmp));
         return tmp;
     }