Rename kde-config to tde-config

pull/1/head
Timothy Pearson 12 years ago
parent 96837efb84
commit edf49c58b5

@ -51,7 +51,7 @@ else (NOT QTC_QT_ONLY)
endif (NOT QTC_QT_ONLY) endif (NOT QTC_QT_ONLY)
#if (NOT QTC_QT_ONLY) #if (NOT QTC_QT_ONLY)
exec_program(kde-config exec_program(tde-config
ARGS --prefix --expandvars ARGS --prefix --expandvars
OUTPUT_VARIABLE CMAKE_INSTALL_PREFIX) OUTPUT_VARIABLE CMAKE_INSTALL_PREFIX)
#endif (NOT QTC_QT_ONLY) #endif (NOT QTC_QT_ONLY)
@ -65,13 +65,13 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/opt/trinity/include")
SET(QT_UIC_EXECUTABLE "/usr/bin/uic-tqt" CACHE FILEPATH "") SET(QT_UIC_EXECUTABLE "/usr/bin/uic-tqt" CACHE FILEPATH "")
SET(QT_MOC_EXECUTABLE "/usr/bin/tmoc" CACHE FILEPATH "") SET(QT_MOC_EXECUTABLE "/usr/bin/tmoc" CACHE FILEPATH "")
exec_program(kde-config exec_program(tde-config
ARGS --install locale --expandvars ARGS --install locale --expandvars
OUTPUT_VARIABLE KDE3_LOCALE_PREFIX) OUTPUT_VARIABLE KDE3_LOCALE_PREFIX)
file(TO_CMAKE_PATH "$ENV{TDEDIRS}" _TDEDIRS) file(TO_CMAKE_PATH "$ENV{TDEDIRS}" _TDEDIRS)
# For KDE4 kde-config has been renamed to kde4-config # For KDE4 tde-config has been renamed to kde4-config
find_program(KDE4_KDECONFIG_EXECUTABLE find_program(KDE4_KDECONFIG_EXECUTABLE
NAMES kde4-config NAMES kde4-config
PATHS ${CMAKE_INSTALL_PREFIX}/bin ${_TDEDIRS} /usr/local/bin /usr/bin /opt/kde4/bin NO_DEFAULT_PATH) PATHS ${CMAKE_INSTALL_PREFIX}/bin ${_TDEDIRS} /usr/local/bin /usr/bin /opt/kde4/bin NO_DEFAULT_PATH)

@ -178,7 +178,7 @@
8. Update Klearlooks to be more consistent with Clearlooks (lighten tab background, 8. Update Klearlooks to be more consistent with Clearlooks (lighten tab background,
use highlight strip on active tab, dont colour active tab) use highlight strip on active tab, dont colour active tab)
9. Use default KDE4 settings to determine colour of text for disabled items. 9. Use default KDE4 settings to determine colour of text for disabled items.
10. When calling kde-config/kde4-config pipe stderr to /dev/null 10. When calling tde-config/kde4-config pipe stderr to /dev/null
0.65.4 0.65.4
------ ------
@ -238,7 +238,7 @@
12. Fix some re-draw errors with thin scrollbar grooves. 12. Fix some re-draw errors with thin scrollbar grooves.
13. Default to reading KDE4 settings if TDE_SESSION_VERSION is not set. 13. Default to reading KDE4 settings if TDE_SESSION_VERSION is not set.
Pass -DQTC_DEFAULT_TO_KDE3=true to cmake to force this to default to KDE3. Pass -DQTC_DEFAULT_TO_KDE3=true to cmake to force this to default to KDE3.
14. Call kde-config / kde4-config to ascertain users TDEHOME. 14. Call tde-config / kde4-config to ascertain users TDEHOME.
15. Fix slight redraw error with glow style mouse over tabs. 15. Fix slight redraw error with glow style mouse over tabs.
16. Remove box from listview arrows when configured to drawn listview lines. 16. Remove box from listview arrows when configured to drawn listview lines.

@ -258,12 +258,12 @@ static TQString kdeHome(bool trinity=false)
{ {
static TQString kdeHome[2]; static TQString kdeHome[2];
// Execute kde-config to ascertain users TDEHOME // Execute tde-config to ascertain users TDEHOME
if(kdeHome[trinity ? 0 : 1].isEmpty()) if(kdeHome[trinity ? 0 : 1].isEmpty())
{ {
FILE *fpipe; FILE *fpipe;
if (fpipe = (FILE*)popen(trinity ? "kde-config --localprefix 2> /dev/null" : "kde4-config --localprefix 2> /dev/null", "r")) if (fpipe = (FILE*)popen(trinity ? "tde-config --localprefix 2> /dev/null" : "kde4-config --localprefix 2> /dev/null", "r"))
{ {
char line[1024]; char line[1024];

Loading…
Cancel
Save