Changeset 846 for trunk/src/corelib/global/qlibraryinfo.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)
• src/corelib/global/qlibraryinfo.cpp (modified) (10 diffs)

trunk/src/corelib/global/qlibraryinfo.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])
@@ -61 +61 @@
 #ifdef Q_OS_MAC
 #  include "private/qcore_mac_p.h"
+
+
+
+
 #endif
 
@@ -103 +107 @@
 
 QT_BEGIN_NAMESPACE
+
+
 
 #ifndef QT_NO_SETTINGS
@@ -333 +339 @@
             break;
 #endif
+
+
+
+
+
 #ifdef QT_CONFIGURE_DATA_PATH
         case DataPath:
@@ -394 +405 @@
             key = QLatin1String("Plugins");
             defaultValue = QLatin1String("plugins");
+
+
+
+
             break;
         case DataPath:
@@ -487 +502 @@
             ret = expandEnvVars(ret);
 #endif
+
+
+
+
+
+
+
+
             config->endGroup();
         }
@@ -535 +558 @@
                     if (urlRef) {
                         QCFString path = CFURLCopyFileSystemPath(urlRef, kCFURLPOSIXPathStyle);
-                        return QDir::cleanPath(path + QLatin1String("/Contents/") + ret);
+                        return QDir::cleanPath( + QLatin1String("/Contents/") + ret);
                     }
                 }
@@ -565 +588 @@
     \value DocumentationPath The location for documentation upon install.
     \value HeadersPath The location for all headers.
-    \value LibrariesPath The location of installed librarires.
+    \value LibrariesPath The location of installed libraries.
     \value BinariesPath The location of installed Qt binaries (tools and applications).
     \value PluginsPath The location of installed Qt plugins.
+
     \value DataPath The location of general Qt data.
     \value TranslationsPath The location of translation information for Qt strings.
@@ -592 +616 @@
 {
     printf("This is the QtCore library version " QT_VERSION_STR "\n"
-           "Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).\n"
+           "Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).\n"
            "Contact: Nokia Corporation ([email protected])\n"
            "\n"
            "Build key:           " QT_BUILD_KEY "\n"
+
+
+
+
+
+
+
+
            "Build date:          %s\n"
            "Installation prefix: %s\n"
@@ -605 +637 @@
            qt_configure_headers_path_str + 12);
 
+
+
 #ifdef QT_EVAL
     extern void qt_core_eval_init(uint);