diff options
| author | Robert Xu <robxu9@gmail.com> | 2011-11-12 18:13:39 -0500 |
|---|---|---|
| committer | Robert Xu <robxu9@gmail.com> | 2011-11-12 18:13:39 -0500 |
| commit | cd1f97695be1245ab19058d4fbc34e5697cc5383 (patch) | |
| tree | b265d96856632dc78e566d337f7eff254b6695f7 /opensuse/core/qt3/qtrc-path.diff | |
| parent | 21fcfa3348213aa87f0e3aef62ca4720c6d31cb7 (diff) | |
| download | tde-packaging-cd1f97695be1245ab19058d4fbc34e5697cc5383.tar.gz tde-packaging-cd1f97695be1245ab19058d4fbc34e5697cc5383.zip | |
fix up tdebase and add qt3
Diffstat (limited to 'opensuse/core/qt3/qtrc-path.diff')
| -rw-r--r-- | opensuse/core/qt3/qtrc-path.diff | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/opensuse/core/qt3/qtrc-path.diff b/opensuse/core/qt3/qtrc-path.diff new file mode 100644 index 000000000..41830d988 --- /dev/null +++ b/opensuse/core/qt3/qtrc-path.diff @@ -0,0 +1,47 @@ +--- src/tools/qsettings.cpp ++++ src/tools/qsettings.cpp +@@ -36,6 +36,7 @@ + **********************************************************************/ + + #include "qplatformdefs.h" ++#include <stdlib.h> + + // POSIX Large File Support redefines open -> open64 + static inline int qt_open( const char *pathname, int flags, mode_t mode ) +@@ -465,8 +466,18 @@ + Q_UNUSED( format ); + #endif + +- QString appSettings(QDir::homeDirPath() + "/.qt/"); +- QString defPath; ++ QString home; ++ home = getenv("QT_HOME_DIR"); ++ if ( !home.isEmpty() ){ ++ home += "/"; ++ QFileInfo i( home + "qtrc" ); ++ if ( !i.isReadable() ) ++ home = QDir::homeDirPath() + "/.qt/"; ++ }else ++ home = QDir::homeDirPath() + "/.qt/"; ++ QString appSettings(home); ++ ++ QString defPath("/etc/X11/"); + #ifdef Q_WS_WIN + #ifdef Q_OS_TEMP + TCHAR path[MAX_PATH]; +@@ -514,6 +525,15 @@ + + if ( !!defPath ) + searchPaths.append(defPath); ++ ++ QString system; ++ system = getenv("QT_SYSTEM_DIR"); ++ if ( !system.isEmpty() && system[0] == '/') { ++ QFileInfo i( system + "/qtrc" ); ++ if ( i.isReadable() ) ++ searchPaths.append(system); ++ } ++ + searchPaths.append(dir.path()); + } + |