Changeset 424

Timestamp:

Dec 14, 2009, 8:22:14 PM (16 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.

Location:

trunk

Files:

• configure.cmd (modified) (2 diffs)
• doc/src/qt-conf.qdoc (modified) (1 diff)
• src/corelib/global/qlibraryinfo.cpp (modified) (3 diffs)

trunk/configure.cmd

@@ -612 +612 @@
     /* settings */
     if (G.QT_INSTALL_SETTINGS == "") then
-        G.QT_INSTALL_SETTINGS = "$(ETC)\qt"
+        G.QT_INSTALL_SETTINGS = "$(ETC)\xdg"
     /* examples */
     if (G.QT_INSTALL_EXAMPLES == "") then
@@ -731 +731 @@
         '[Paths]'G.EOL||,
         'Prefix = ..'G.EOL||,
-        'Settings = $(ETC)/qt'G.EOL
+        'Settings = $(ETC)/xdg'G.EOL
     call charout qt_conf
 

trunk/doc/src/qt-conf.qdoc

@@ -86 +86 @@
     (or the application executable if Qt is built as a static library)
 
-    \o \c %ETC%\qt\qtsys.conf
+    \o \c %ETC%\qtsys.conf
     
     \endlist

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,
+                            QFile::decodeName(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,
+                            QFile::decodeName(qgetenv(ret.mid(rep + 2,
                                 reg_var.matchedLength() - 3).toLatin1().constData()).constData()));
             }