Merge commit 'qt/master-stable' into 4.6-merged

Conflicts:
	.gitignore
	configure.exe
	src/corelib/concurrent/qtconcurrentthreadengine.h
	src/corelib/global/qnamespace.h
	src/gui/graphicsview/qgraphicssceneevent.h
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication.h
	src/gui/kernel/qapplication_p.h
	src/gui/kernel/qapplication_qws.cpp
	src/gui/kernel/qwidget.h
	src/gui/painting/qpaintengine_raster.cpp
	src/gui/text/qfontdatabase.cpp
	src/network/access/qnetworkaccesshttpbackend.cpp
	tests/auto/network-settings.h
	tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro
	tests/auto/qvariant/tst_qvariant.cpp

1 files changed, 24 insertions, 9 deletions

diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri
index 8e3b6cb..a8d09b0 100644
--- a/src/gui/kernel/kernel.pri
+++ b/src/gui/kernel/kernel.pri
@@ -41,7 +41,15 @@ HEADERS += \
 	kernel/qwidgetaction.h \
 	kernel/qwidgetaction_p.h \
 	kernel/qwindowdefs.h \
-	kernel/qkeymapper_p.h
+	kernel/qkeymapper_p.h \
+	kernel/qgesture.h \
+	kernel/qgesture_p.h \
+	kernel/qgesturemanager_p.h \
+	kernel/qgesturerecognizer_p.h \
+	kernel/qgesturerecognizer.h \
+	kernel/qgesturestandardrecognizers_p.h \
+	kernel/qdirectionrecognizer_p.h \
+	kernel/qdirectionsimplificator_p.h
 
 SOURCES += \
 	kernel/qaction.cpp \
@@ -70,7 +78,12 @@ SOURCES += \
 	kernel/qwhatsthis.cpp \
 	kernel/qwidget.cpp \
 	kernel/qwidgetaction.cpp \
-	kernel/qkeymapper.cpp
+	kernel/qkeymapper.cpp \
+	kernel/qgesture.cpp \
+	kernel/qgesturemanager.cpp \
+	kernel/qgesturerecognizer.cpp \
+	kernel/qgesturestandardrecognizers.cpp \
+	kernel/qdirectionrecognizer.cpp
 
 win32 {
 	DEFINES += QT_NO_DIRECTDRAW
@@ -185,24 +198,26 @@ embedded {
                 qcocoaview_mac_p.h \
                 qcocoaapplication_mac_p.h \
                 qcocoaapplicationdelegate_mac_p.h \
+                qmultitouch_mac_p.h 
 
         OBJECTIVE_SOURCES += \
                 kernel/qcursor_mac.mm \
                 kernel/qdnd_mac.mm \
                 kernel/qsound_mac.mm  \
                 kernel/qapplication_mac.mm \
-		kernel/qwidget_mac.mm \
-		kernel/qcocoapanel_mac.mm \
-		kernel/qcocoaview_mac.mm \
-		kernel/qcocoawindow_mac.mm \
-		kernel/qcocoawindowdelegate_mac.mm \
+		        kernel/qwidget_mac.mm \
+		        kernel/qcocoapanel_mac.mm \
+                kernel/qcocoaview_mac.mm \
+                kernel/qcocoawindow_mac.mm \
+                kernel/qcocoawindowdelegate_mac.mm \
                 kernel/qcocoamenuloader_mac.mm \
                 kernel/qcocoaapplication_mac.mm \
                 kernel/qcocoaapplicationdelegate_mac.mm \
                 kernel/qt_cocoa_helpers_mac.mm \
-		kernel/qdesktopwidget_mac.mm \
+                kernel/qdesktopwidget_mac.mm \
                 kernel/qeventdispatcher_mac.mm \
-                kernel/qcocoawindowcustomthemeframe_mac.mm
+                kernel/qcocoawindowcustomthemeframe_mac.mm \   
+                kernel/qmultitouch_mac.mm \
 
         HEADERS += \
                 kernel/qt_cocoa_helpers_mac_p.h \