diff options
| author | Timothy Pearson <[email protected]> | 2012-03-07 22:21:23 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-03-07 22:21:23 -0600 |
| commit | b6609bb30d91121e98eb2bbe2cf89ff144680e84 (patch) | |
| tree | 5d8a9133155e9e2e9cde60e2cc3670de03ae5d35 /tqt3integration | |
| parent | 2242eb95a7bcd686207e2043340fed5ccc8b7609 (diff) | |
| parent | 56a663b7c2cf18978a349015b6e19f1d898e8bb9 (diff) | |
| download | tdebase-b6609bb30d91121e98eb2bbe2cf89ff144680e84.tar.gz tdebase-b6609bb30d91121e98eb2bbe2cf89ff144680e84.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'tqt3integration')
| -rw-r--r-- | tqt3integration/module/kdeintegration.desktop | 2 | ||||
| -rw-r--r-- | tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tqt3integration/module/kdeintegration.desktop b/tqt3integration/module/kdeintegration.desktop index 0f41e5e99..bb41bd97f 100644 --- a/tqt3integration/module/kdeintegration.desktop +++ b/tqt3integration/module/kdeintegration.desktop @@ -10,4 +10,4 @@ X-KDE-Kded-autoload=false X-KDE-Kded-load-on-demand=true Name=KDE Integration Module -Comment=Module for integrating UI of non-KDE applications +Comment=Module for integrating UI of non-TDE applications diff --git a/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp b/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp index 2b9d5e5bb..947109afd 100644 --- a/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp +++ b/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp @@ -41,9 +41,9 @@ bool TQKDEIntegration::enabled() static TQCString findLibrary() { - if( getenv( "KDE_FULL_SESSION" ) == NULL ) + if( getenv( "TDE_FULL_SESSION" ) == NULL ) return ""; - if( getenv( "KDE_FULL_SESSION" )[ 0 ] != 't' && getenv( "KDE_FULL_SESSION" )[ 0 ] != '1' ) + if( getenv( "TDE_FULL_SESSION" )[ 0 ] != 't' && getenv( "TDE_FULL_SESSION" )[ 0 ] != '1' ) return ""; if( getenv( "TQT_NO_KDE_INTEGRATION" ) == NULL || getenv( "TQT_NO_KDE_INTEGRATION" )[ 0 ] == '0' ) |