Changeset 846 for trunk/src/corelib/global/qfeatures.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/qfeatures.h (modified) (4 diffs)

trunk/src/corelib/global/qfeatures.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])
@@ -86 +86 @@
 //#define QT_NO_FREETYPE
 
+
+
+
 // QGroupBox
 //#define QT_NO_GROUPBOX
@@ -501 +504 @@
 #endif
 
+
+
+
+
+
 // Context menu
 #if !defined(QT_NO_CONTEXTMENU) && (defined(QT_NO_MENU))
@@ -506 +514 @@
 #endif
 
+
+
+
+
+
 // File Transfer Protocol
 #if !defined(QT_NO_FTP) && (defined(QT_NO_URLINFO) || defined(QT_NO_TEXTDATE))