Changeset 769 for trunk/src/tools/uic

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

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

Location:

trunk

Files:

• . (modified) (1 prop)
• src/tools/uic/cpp/cppwriteinitialization.cpp (modified) (2 diffs)
• src/tools/uic/qclass_lib_map.h (modified) (1 diff)

trunk/src/tools/uic/cpp/cppwriteinitialization.cpp

@@ -2789 +2789 @@
 
     QMap<QString, bool> map; // bool is dummy. The idea is to sort that (always generate in the same order) by putting a set into a map
-    foreach (QString str, directives)
-        map[str] = true;
+    foreach (const QString &str, directives)
+        map.insert(str, true);
 
     if (map.size() == 1) {
@@ -2799 +2799 @@
     outputStream << "#if";
     bool doOr = false;
-    foreach (QString str, map.keys()) {
+    foreach (const QString &str, map.keys()) {
         if (doOr)
             outputStream << " ||";

trunk/src/tools/uic/qclass_lib_map.h

@@ -458 +458 @@
 QT_CLASS_LIB(QWebSettings, QtWebKit, qwebsettings.h)
 QT_CLASS_LIB(QWebView, QtWebKit, qwebview.h)
+QT_CLASS_LIB(QAudio, QtMultimedia, qaudio.h)
 QT_CLASS_LIB(QAudioDeviceInfo, QtMultimedia, qaudiodeviceinfo.h)
 QT_CLASS_LIB(QAbstractAudioDeviceInfo, QtMultimedia, qaudioengine.h)