Changeset 846 for trunk/src/corelib/io/qsettings_win.cpp

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/io/qsettings_win.cpp (modified) (3 diffs)

trunk/src/corelib/io/qsettings_win.cpp

@@ -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])
@@ -536 +536 @@
         }
 
+
+
+
+
+
+
+
+
+
         default:
             qWarning("QSettings: Unknown data %d type in Windows registry", static_cast<int>(dataType));
@@ -684 +693 @@
         }
 
-        case QVariant::Int: {
+        case QVariant::Int:
+        case QVariant::UInt: {
             type = REG_DWORD;
-            int i = value.toInt();
-            regValueBuff = QByteArray((const char*)&i, sizeof(int));
+            qint32 i = value.toInt();
+            regValueBuff = QByteArray((const char*)&i, sizeof(qint32));
+            break;
+        }
+
+        case QVariant::LongLong:
+        case QVariant::ULongLong: {
+            type = REG_QWORD;
+            qint64 i = value.toLongLong();
+            regValueBuff = QByteArray((const char*)&i, sizeof(qint64));
             break;
         }