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

trunk/tools/assistant/lib/qhelpdbreader.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -206 +206 @@
         "AND c.Name=? AND c.NamespaceId=d.Id AND d.Name=?"));
     m_query->bindValue(0, filePath);
-    m_query->bindValue(1, QLatin1String("./") + filePath);
+    m_query->bindValue(1, QString(QLatin1String("./") + filePath));
     m_query->bindValue(2, virtualFolder);
     m_query->bindValue(3, m_namespace);