Changeset 424 for trunk/src/corelib

Timestamp:

Dec 14, 2009, 8:22:14 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: QLibraryInfo: Changed default "Settings" path to %ETC%/xdg. Also use %ETC%/qtsys.conf as the system-wide qt.conf instead of %ETC%/qt/qtsys.conf.

File:

• trunk/src/corelib/global/qlibraryinfo.cpp (modified) (3 diffs)

trunk/src/corelib/global/qlibraryinfo.cpp

@@ -175 +175 @@
                 qtconfig = QDir::rootPath();
             qtconfig = QDir::fromNativeSeparators(qtconfig) +
-                       QLatin1String("/qt/qtsys.conf");
+                       QLatin1String("/qtsys.conf");
             qtconfig = QDir::cleanPath(qtconfig);
         }
@@ -347 +347 @@
             while((rep = reg_var.indexIn(ret)) != -1) {
                 ret.replace(rep, reg_var.matchedLength(),
-                            QString::fromLocal8Bit(qgetenv(ret.mid(rep + 2,
+                            Q(qgetenv(ret.mid(rep + 2,
                                 reg_var.matchedLength() - 3).toLatin1().constData()).constData()));
             }
@@ -474 +474 @@
             while((rep = reg_var.indexIn(ret)) != -1) {
                 ret.replace(rep, reg_var.matchedLength(),
-                            QString::fromLocal8Bit(qgetenv(ret.mid(rep + 2,
+                            Q(qgetenv(ret.mid(rep + 2,
                                 reg_var.matchedLength() - 3).toLatin1().constData()).constData()));
             }