Changeset 651 for trunk/src/corelib/global

Timestamp:

Mar 8, 2010, 12:52:58 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.2 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/global/qconfig-dist.h (modified) (1 diff)
• src/corelib/global/qconfig-large.h (modified) (1 diff)
• src/corelib/global/qconfig-medium.h (modified) (1 diff)
• src/corelib/global/qconfig-minimal.h (modified) (1 diff)
• src/corelib/global/qconfig-small.h (modified) (1 diff)
• src/corelib/global/qendian.h (modified) (1 diff)
• src/corelib/global/qendian.qdoc (modified) (1 diff)
• src/corelib/global/qfeatures.h (modified) (1 diff)
• src/corelib/global/qglobal.cpp (modified) (1 diff)
• src/corelib/global/qglobal.h (modified) (4 diffs)
• src/corelib/global/qlibraryinfo.cpp (modified) (2 diffs)
• src/corelib/global/qlibraryinfo.h (modified) (1 diff)
• src/corelib/global/qmalloc.cpp (modified) (1 diff)
• src/corelib/global/qnamespace.h (modified) (2 diffs)
• src/corelib/global/qnamespace.qdoc (modified) (4 diffs)
• src/corelib/global/qnumeric.cpp (modified) (1 diff)
• src/corelib/global/qnumeric.h (modified) (1 diff)
• src/corelib/global/qnumeric_p.h (modified) (1 diff)
• src/corelib/global/qt_pch.h (modified) (1 diff)
• src/corelib/global/qt_windows.h (modified) (1 diff)

trunk/src/corelib/global/qconfig-dist.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/global/qconfig-large.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/global/qconfig-medium.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/global/qconfig-minimal.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/global/qconfig-small.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/global/qendian.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/global/qendian.qdoc

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/global/qfeatures.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/global/qglobal.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/global/qglobal.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -45 +45 @@
 #include <stddef.h>
 
-#define QT_VERSION_STR "4.6.1"
+#define QT_VERSION_STR "4.6."
 /*
    QT_VERSION is (major << 16) + (minor << 8) + patch.
 */
-#define QT_VERSION 0x040601
+#define QT_VERSION 0x04060
 /*
    can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
@@ -55 +55 @@
 #define QT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
 
-#define QT_PACKAGEDATE_STR "2010-01-16"
-
-#define QT_PACKAGE_TAG "9b05cc074bd5ee49de0f141dd5a389ec10e3c665"
+#define QT_PACKAGEDATE_STR "2010-0"
+
+#define QT_PACKAGE_TAG ""
 
 #if !defined(QT_BUILD_MOC)
@@ -2419 +2419 @@
 #define QT_SYMBIAN_SUPPORTS_SGIMAGE
 #define QT_SYMBIAN_SUPPORTS_ADVANCED_POINTER
+
+
+
+
 #endif
 

trunk/src/corelib/global/qlibraryinfo.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -582 +582 @@
 {
     printf("This is the QtCore library version " QT_VERSION_STR "\n"
-           "Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).\n"
+           "Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).\n"
            "Contact: Nokia Corporation ([email protected])\n"
            "\n"

trunk/src/corelib/global/qlibraryinfo.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/global/qmalloc.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/global/qnamespace.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -497 +497 @@
         WA_WState_AcceptedTouchBeginEvent = 122,
         WA_TouchPadAcceptSingleTouchEvents = 123,
+
+
+
 
         // Add new attributes before this line

trunk/src/corelib/global/qnamespace.qdoc

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -135 +135 @@
            shown in any menus unless specifically set by the
            QAction::iconVisibleInMenu property.
-
            Menus that are currently open or menus already created in the native
            Mac OS X menubar \e{may not} pick up a change in this attribute. Changes
@@ -526 +525 @@
            if the emitter and receiver are in different threads.
 
-    \value DirectConnection  
+    \value DirectConnection
            The slot is invoked immediately, when the signal is
            emitted.
 
-    \value QueuedConnection  
+    \value QueuedConnection
            The slot is invoked when control returns to the event loop
            of the receiver's thread. The slot is executed in the
@@ -1244 +1243 @@
     \value WA_TouchPadAcceptSingleTouchEvents Allows touchpad single
     touch events to be sent to the widget.
+
+
+
+
+
+
+
+
+
+
+
 
     \omitvalue WA_SetLayoutDirection

trunk/src/corelib/global/qnumeric.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/global/qnumeric.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/global/qnumeric_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/global/qt_pch.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/global/qt_windows.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])