Changeset 846 for trunk/tools/assistant/lib/qhelpcollectionhandler.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)
• tools/assistant/lib/qhelpcollectionhandler.cpp (modified) (5 diffs)

trunk/tools/assistant/lib/qhelpcollectionhandler.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])
@@ -115 +115 @@
     }
 
+
+
+
     m_query.exec(QLatin1String("SELECT COUNT(*) FROM sqlite_master WHERE TYPE=\'table\'"
                                "AND Name=\'NamespaceTable\'"));
@@ -163 +166 @@
         return false;
     }
+
+
+
 
     if (!createTables(copyQuery)) {
@@ -309 +315 @@
     m_query.bindValue(0, filterName);
     m_query.exec();
-    while (m_query.next()) {
+    
         nameId = m_query.value(0).toInt();
-        break;
-    }
 
     m_query.exec(QLatin1String("SELECT Id, Name FROM FilterAttributeTable"));
@@ -585 +589 @@
 
         QSqlQuery query(db);
+
+
         db.exec(QLatin1String("CREATE INDEX IF NOT EXISTS NameIndex ON IndexTable(Name)"));
         db.exec(QLatin1String("CREATE INDEX IF NOT EXISTS FileNameIndex ON FileNameTable(Name)"));