diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2012-08-02 11:13:12 +0200 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2012-08-02 11:13:12 +0200 |
| commit | 6548b413944f5b913bd9e1f3f9552cc0e362eb03 (patch) | |
| tree | cb8a3a59db476b57ab43973b8a8a38a9f12e02e8 /opensuse/core/tqt3/qtrc-path.diff | |
| parent | 0704427510fa18d90170cf13d1fd81e446a1d3b0 (diff) | |
| parent | ea17f4d8a64f5dd9e3484984cd23e8a3646d28bf (diff) | |
| download | tde-packaging-6548b413944f5b913bd9e1f3f9552cc0e362eb03.tar.gz tde-packaging-6548b413944f5b913bd9e1f3f9552cc0e362eb03.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'opensuse/core/tqt3/qtrc-path.diff')
| -rw-r--r-- | opensuse/core/tqt3/qtrc-path.diff | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/opensuse/core/tqt3/qtrc-path.diff b/opensuse/core/tqt3/qtrc-path.diff new file mode 100644 index 000000000..315474eac --- /dev/null +++ b/opensuse/core/tqt3/qtrc-path.diff @@ -0,0 +1,49 @@ +Index: src/tools/qsettings.cpp +=================================================================== +--- src/tools/qsettings.cpp.orig ++++ src/tools/qsettings.cpp +@@ -39,6 +39,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 ) +@@ -468,8 +469,18 @@ TQSettingsPrivate::TQSettingsPrivate( TQ + Q_UNUSED( format ); + #endif + +- TQString appSettings(TQDir::homeDirPath() + "/.qt/"); +- TQString defPath; ++ TQString home; ++ home = getenv("TQT_HOME_DIR"); ++ if ( !home.isEmpty() ){ ++ home += "/"; ++ TQFileInfo i( home + "qtrc" ); ++ if ( !i.isReadable() ) ++ home = TQDir::homeDirPath() + "/.qt/"; ++ }else ++ home = TQDir::homeDirPath() + "/.qt/"; ++ TQString appSettings(home); ++ ++ TQString defPath("/etc/X11/"); + #ifdef Q_WS_WIN + #ifdef Q_OS_TEMP + TCHAR path[MAX_PATH]; +@@ -517,6 +528,15 @@ TQSettingsPrivate::TQSettingsPrivate( TQ + + if ( !!defPath ) + searchPaths.append(defPath); ++ ++ TQString system; ++ system = getenv("TQT_SYSTEM_DIR"); ++ if ( !system.isEmpty() && system[0] == '/') { ++ TQFileInfo i( system + "/qtrc" ); ++ if ( i.isReadable() ) ++ searchPaths.append(system); ++ } ++ + searchPaths.append(dir.path()); + } + |