Changeset 561 for trunk/tools/designer/src/lib/shared/previewconfigurationwidget.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/designer/src/lib/shared/previewconfigurationwidget.cpp (modified) (5 diffs)

trunk/tools/designer/src/lib/shared/previewconfigurationwidget.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the Qt Designer of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -66 +66 @@
 #include <QtCore/QSharedData>
 
-// #define DEFAULT_SKINS_FROM_RESOURCE
-#ifdef DEFAULT_SKINS_FROM_RESOURCE
+
+static const char *skinResourcePathC = ":/skins/";
+
 QT_BEGIN_NAMESPACE
-static const char *skinResourcePathC = ":/skins/";
-QT_END_NAMESPACE
-#else
-#  include <QtCore/QLibraryInfo>
-#endif
-
-QT_BEGIN_NAMESPACE
 
 static const char *skinExtensionC = "skin";
 
-namespace {
-    // Pair of skin name, path
-    typedef QPair<QString, QString> SkinNamePath;
-    typedef QList<SkinNamePath> Skins;
-    enum { SkinComboNoneIndex = 0 };
-}
+// Pair of skin name, path
+typedef QPair<QString, QString> SkinNamePath;
+typedef QList<SkinNamePath> Skins;
+enum { SkinComboNoneIndex = 0 };
 
 // find default skins (resources)
@@ -90 +82 @@
     static Skins rc;
     if (rc.empty()) {
-#ifdef DEFAULT_SKINS_FROM_RESOURCE
         const QString skinPath = QLatin1String(skinResourcePathC);
-#else
-        QString skinPath = QLibraryInfo::location(QLibraryInfo::PrefixPath);
-        skinPath += QDir::separator();
-        skinPath += QLatin1String("tools");
-        skinPath += QDir::separator();
-        skinPath += QLatin1String("qvfb");
-#endif
         QString pattern = QLatin1String("*.");
         pattern += QLatin1String(skinExtensionC);
         const QDir dir(skinPath, pattern);
-        const QFileInfoList list = dir.entryInfoList();
+        const QFileInfoList list = dir.entryInfoList();
         if (list.empty())
             return rc;