Changeset 846 for trunk/src/corelib/global/qnamespace.h

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/global/qnamespace.h (modified) (14 diffs)

trunk/src/corelib/global/qnamespace.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -91 +91 @@
     Q_FLAGS(WindowFlags WindowStates InputMethodHints)
     Q_ENUMS(ConnectionType)
+
+
+
+
 #endif // (defined(Q_MOC_RUN) || defined(QT_JAMBI_RUN))
 
@@ -147 +151 @@
         LeftButton       = 0x00000001,
         RightButton      = 0x00000002,
-        MidButton        = 0x00000004,
+        MidButton        = 0x00000004, // ### Qt 5: remove me
+        MiddleButton     = MidButton,
         XButton1         = 0x00000008,
         XButton2         = 0x00000010,
@@ -236 +241 @@
         TextForceLeftToRight = 0x20000,
         TextForceRightToLeft = 0x40000,
-        TextLongestVariant = 0x80000
+        TextLongestVariant = 0x80000,
+        TextBypassShaping = 0x100000
 
 #if defined(QT3_SUPPORT) && !defined(Q_MOC_RUN)
@@ -503 +509 @@
         WA_MergeSoftkeysRecursively =  125,
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         // Add new attributes before this line
         WA_AttributeCount
@@ -518 +542 @@
         AA_MacDontSwapCtrlAndMeta = 7,
         AA_S60DontConstructApplicationPanes = 8,
+
 
         // Add new attributes before this line
@@ -936 +961 @@
         Key_MediaNext  = 0x01000083,
         Key_MediaRecord = 0x01000084,
+
+
         Key_HomePage  = 0x01000090,
         Key_Favorites  = 0x01000091,
@@ -1052 +1079 @@
         Key_ContrastAdjust = 0x0100010d,
 
+
+
+
         Key_MediaLast = 0x0100ffff,
 
@@ -1075 +1105 @@
         Key_Context3 = 0x01100002,
         Key_Context4 = 0x01100003,
-        Key_Call = 0x01100004,
-        Key_Hangup = 0x01100005,
+        Key_Call = 0x01100004,
+        Key_Hangup = 0x01100005,
         Key_Flip = 0x01100006,
+
+
+
+
+
+
 
         Key_unknown = 0x01ffffff
@@ -1238 +1274 @@
         OpenHandCursor,
         ClosedHandCursor,
-        LastCursor = ClosedHandCursor,
+        DragCopyCursor,
+        DragMoveCursor,
+        DragLinkCursor,
+        LastCursor = DragLinkCursor,
         BitmapCursor = 24,
         CustomCursor = 25
@@ -1535 +1574 @@
     enum LayoutDirection {
         LeftToRight,
-        RightToLeft
+        RightToLeft,
+        LayoutDirectionAuto
     };
 
@@ -1702 +1742 @@
     Q_DECLARE_FLAGS(TouchPointStates, TouchPointState)
 
+
     enum GestureState
     {
@@ -1727 +1768 @@
     {
         DontStartGestureOnChildren = 0x01,
-        ReceivePartialGestures     = 0x02
+        ReceivePartialGestures     = 0x02,
+        IgnoredGesturesPropagateToParent = 0x04
     };
     Q_DECLARE_FLAGS(GestureFlags, GestureFlag)
+
 
     enum NavigationMode
@@ -1759 +1802 @@
 Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::InputMethodHints)
 Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::TouchPointStates)
+
 Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::GestureFlags)
+
 
 typedef bool (*qInternalCallback)(void **);