Changeset 846 for trunk/tools/designer/src/lib/shared/qtresourceview.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/designer/src/lib/shared/qtresourceview.cpp (modified) (4 diffs)

trunk/tools/designer/src/lib/shared/qtresourceview.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])
@@ -382 +382 @@
         return;
 
-    const QString root(QLatin1Char(':'));
+    // Resource root up until 4.6 was ':', changed to ":/" as of 4.7
+    const QString root(QLatin1String(":/"));
 
     QMap<QString, QString> contents = m_resourceModel->contents();
@@ -425 +426 @@
 
     const bool matchAll = m_filterPattern.isEmpty();
-    const QString root(QLatin1Char(':'));
+    const QString root(QLatin1));
 
     QQueue<QString> pathQueue;
@@ -669 +670 @@
 void QtResourceView::selectResource(const QString &resource)
 {
+
+
     QFileInfo fi(resource);
     QDir dir = fi.absoluteDir();