Merge commit 'qt/master-stable'

Conflicts:
	configure.exe
	qmake/Makefile.unix
	qmake/generators/makefile.cpp
	src/corelib/global/qglobal.h
	src/corelib/kernel/kernel.pri
	src/corelib/kernel/qcoreevent.cpp
	src/corelib/kernel/qsharedmemory_unix.cpp
	src/gui/graphicsview/qgraphicsscene.cpp
	src/gui/kernel/qaction.cpp
	src/gui/kernel/qaction.h
	src/gui/kernel/qaction_p.h
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication.h
	src/gui/kernel/qwidget.cpp
	src/gui/kernel/qwidget.h
	src/gui/kernel/qwidget_mac.mm
	src/gui/painting/qgraphicssystemfactory.cpp
	src/gui/styles/qwindowsstyle.cpp
	src/gui/text/qfontengine_qpf.cpp
	src/gui/widgets/qabstractscrollarea_p.h
	src/network/access/qnetworkaccessdebugpipebackend.cpp
	src/network/socket/qlocalsocket_unix.cpp
	src/network/socket/qnativesocketengine_p.h
	src/network/socket/qnativesocketengine_unix.cpp
	src/openvg/qpaintengine_vg.cpp
	tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
	tests/auto/qcssparser/qcssparser.pro
	tests/auto/qdir/tst_qdir.cpp
	tests/auto/qfile/tst_qfile.cpp
	tests/auto/qobject/tst_qobject.cpp
	tests/auto/qpathclipper/qpathclipper.pro
	tests/auto/qprocess/tst_qprocess.cpp
	tests/auto/qsettings/tst_qsettings.cpp
	tests/auto/qsharedpointer/qsharedpointer.pro
	tests/auto/qsqlquerymodel/qsqlquerymodel.pro
	tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
	tests/auto/qsqltablemodel/qsqltablemodel.pro
	tests/auto/qsqlthread/qsqlthread.pro
	tests/auto/qwidget/tst_qwidget.cpp

1 files changed, 2 insertions, 30 deletions

diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index fdd7eee..ceec078 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -1435,7 +1435,8 @@ public:
         ToolButtonIconOnly,
         ToolButtonTextOnly,
         ToolButtonTextBesideIcon,
-        ToolButtonTextUnderIcon
+        ToolButtonTextUnderIcon,
+        ToolButtonFollowStyle
     };
 
     enum LayoutDirection {
@@ -1589,18 +1590,6 @@ public:
     };
     Q_DECLARE_FLAGS(TouchPointStates, TouchPointState)
 
-    enum GestureType
-    {
-        UnknownGesture,
-        TapGesture,
-        DoubleTapGesture,
-        TrippleTapGesture,
-        TapAndHoldGesture,
-        PanGesture,
-        PinchGesture
-    };
-
-
     enum GestureState
     {
         NoGesture,
@@ -1609,23 +1598,6 @@ public:
         GestureFinished = 3
     };
 
-    enum DirectionType
-    {
-        NoDirection = 0,
-        LeftDownDirection = 1,
-        DownLeftDirection = LeftDownDirection,
-        DownDirection = 2,
-        RightDownDirection = 3,
-        DownRightDirection = RightDownDirection,
-        LeftDirection = 4,
-        RightDirection = 6,
-        LeftUpDirection = 7,
-        UpLeftDirection = LeftUpDirection,
-        UpDirection = 8,
-        RightUpDirection = 9,
-        UpRightDirection = RightUpDirection
-    };
-
 }
 #ifdef Q_MOC_RUN
  ;