diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-21 01:43:11 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-21 01:43:11 +0000 |
| commit | cca90c8313268dbedccd9ff138d86eb1bb4bbb2a (patch) | |
| tree | d2fb486378fd6c3f4ceb37e573d5aa8d3cc73ded | |
| parent | 41744d303a3133aad64125243a0a173a12d2d4bf (diff) | |
| download | rosegarden-cca90c8313268dbedccd9ff138d86eb1bb4bbb2a.tar.gz rosegarden-cca90c8313268dbedccd9ff138d86eb1bb4bbb2a.zip | |
Convert remaining references to kde3 (e.g. in paths) to trinity
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | cmake_admin/FindKDECONFIG.cmake | 2 | ||||
| -rw-r--r-- | cmake_admin/FindMEINPROC.cmake | 2 | ||||
| -rw-r--r-- | src/gui/editors/notation/FontViewFrame.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cmake_admin/FindKDECONFIG.cmake b/cmake_admin/FindKDECONFIG.cmake index d610682..5bce104 100644 --- a/cmake_admin/FindKDECONFIG.cmake +++ b/cmake_admin/FindKDECONFIG.cmake @@ -39,7 +39,7 @@ IF(KDECONFIG_EXECUTABLE) ELSE(KDECONFIG_EXECUTABLE) FIND_PROGRAM(KDECONFIG_EXECUTABLE NAMES kde-config PATHS $ENV{KDEDIR}/bin - /opt/kde3/bin + /opt/trinity/bin /opt/kde/bin NO_DEFAULT_PATH ) diff --git a/cmake_admin/FindMEINPROC.cmake b/cmake_admin/FindMEINPROC.cmake index 26c0f0b..fb0892d 100644 --- a/cmake_admin/FindMEINPROC.cmake +++ b/cmake_admin/FindMEINPROC.cmake @@ -40,7 +40,7 @@ ELSE(MEINPROC_EXECUTABLE) /usr/bin /usr/local/bin /opt/kde/bin - /opt/kde3/bin ) + /opt/trinity/bin ) IF(MEINPROC_EXECUTABLE) SET(MEINPROC_FOUND TRUE) ELSE(MEINPROC_EXECUTABLE) diff --git a/src/gui/editors/notation/FontViewFrame.cpp b/src/gui/editors/notation/FontViewFrame.cpp index 3770441..d07ba40 100644 --- a/src/gui/editors/notation/FontViewFrame.cpp +++ b/src/gui/editors/notation/FontViewFrame.cpp @@ -82,7 +82,7 @@ FontViewFrame::loadFont() static bool haveDir = false; if (!haveDir) { FcConfigAppFontAddDir(FcConfigGetCurrent(), - (const FcChar8 *)"/opt/kde3/share/apps/rosegarden/fonts"); + (const FcChar8 *)"/opt/trinity/share/apps/rosegarden/fonts"); haveDir = true; } |