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 | 452dc1bc85da499f67d6cacd130263377552c631 (patch) | |
tree | bd859131120b044fd19fcb847e18a2e74ee9a923 /win | |
parent | 25a5b3950e013d67b68f091cdfac27eb1ad0debc (diff) | |
download | tdelibs-452dc1bc85da499f67d6cacd130263377552c631.tar.gz tdelibs-452dc1bc85da499f67d6cacd130263377552c631.zip |
Convert remaining references to kde3 (e.g. in paths) to trinity
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1248408 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'win')
-rw-r--r-- | win/common.pro | 16 | ||||
-rw-r--r-- | win/pro_files/kate/part/part.pro | 2 | ||||
-rw-r--r-- | win/pro_files/kdewidgets/kdewidgets.pro | 4 | ||||
-rw-r--r-- | win/pro_files/kioslave/common.pro | 2 | ||||
-rw-r--r-- | win/tools/build_kdelibs_dbg | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/win/common.pro b/win/common.pro index 669d22d62..2e7837a82 100644 --- a/win/common.pro +++ b/win/common.pro @@ -12,7 +12,7 @@ exists( custom_defs.pro ) { } # common version info for all libs: -!contains( CONFIG, kde3lib ) { +!contains( CONFIG, trinitylib ) { VER_MAJ = $(KDE_VER_MAJ) VER_MIN = $(KDE_VER_MIN) VER_PAT = $(KDE_VER_PAT) @@ -62,10 +62,10 @@ isEmpty( KDEBUG ) { } !contains(CONFIG,debug) { KDEBUG=_ - contains(CONFIG,kde3lib) { + contains(CONFIG,trinitylib) { KDELIBDEBUG= } - !contains(CONFIG,kde3lib) { + !contains(CONFIG,trinitylib) { KDELIBDEBUG=_ } KDELIBDEBUGLIB=.lib @@ -101,16 +101,16 @@ contains( TEMPLATE, lib ) { # indicate that we building a library QMAKE_CXXFLAGS += -DKDE_MAKE_LIB=1 - # lib/kde3 dest dir (for modules) - contains( CONFIG, kde3lib ) { - DESTDIR = $$KDEBINDESTDIR/lib/kde3 + # lib/trinity dest dir (for modules) + contains( CONFIG, trinitylib ) { + DESTDIR = $$KDEBINDESTDIR/lib/trinity TARGET_EXT = .dll #- no ver. in filename } - !contains( CONFIG, kde3lib ) { + !contains( CONFIG, trinitylib ) { DESTDIR = $$KDELIBDESTDIR } contains( CONFIG, kstyle ) { - DESTDIR = $$KDEBINDESTDIR/lib/kde3/plugins/styles + DESTDIR = $$KDEBINDESTDIR/lib/trinity/plugins/styles CONFIG += plugin } # !contains(CONFIG,debug) { diff --git a/win/pro_files/kate/part/part.pro b/win/pro_files/kate/part/part.pro index 82a9aa046..46edc6508 100644 --- a/win/pro_files/kate/part/part.pro +++ b/win/pro_files/kate/part/part.pro @@ -1,5 +1,5 @@ TEMPLATE = lib -CONFIG += kde3lib #this is a kde module library +CONFIG += trinitylib #this is a kde module library include( $(KDELIBS)/win/common.pro ) diff --git a/win/pro_files/kdewidgets/kdewidgets.pro b/win/pro_files/kdewidgets/kdewidgets.pro index 1458bf323..e56eaba06 100644 --- a/win/pro_files/kdewidgets/kdewidgets.pro +++ b/win/pro_files/kdewidgets/kdewidgets.pro @@ -1,5 +1,5 @@ TEMPLATE = lib -CONFIG += kde3lib #this is a dynamic kde library +CONFIG += trinitylib #this is a dynamic kde library include( $(KDELIBS)/win/common.pro ) @@ -9,7 +9,7 @@ system( makekdewidgets -o kdewidgets.cpp kde.widgets ) TARGET = kdewidgets -DESTDIR = $$KDELIBDESTDIR/kde3/plugins/designer +DESTDIR = $$KDELIBDESTDIR/trinity/plugins/designer LIBS += $$KDELIBDESTDIR/kdecore$$KDELIB_SUFFIX $$KDELIBDESTDIR/kio$$KDELIB_SUFFIX \ $$KDELIBDESTDIR/kdeui$$KDELIB_SUFFIX \ diff --git a/win/pro_files/kioslave/common.pro b/win/pro_files/kioslave/common.pro index 2bb1361f7..35fbaf5d9 100644 --- a/win/pro_files/kioslave/common.pro +++ b/win/pro_files/kioslave/common.pro @@ -1,6 +1,6 @@ TEMPLATE = lib -CONFIG += kde3lib #this is a dynamic kde library +CONFIG += trinitylib #this is a dynamic kde library include( $(KDELIBS)/win/common.pro ) diff --git a/win/tools/build_kdelibs_dbg b/win/tools/build_kdelibs_dbg index 6b9aaed38..ca46d6865 100644 --- a/win/tools/build_kdelibs_dbg +++ b/win/tools/build_kdelibs_dbg @@ -73,7 +73,7 @@ qmake makekdewidgets.pro && $make clean && $make || exit 1 qmake && $make clean && $make || exit 1 # copy kdewidgets plugin for Qt Designer -cp $KDEDIR/lib/kde3/plugins/designer/kdewidgets.dll $QTDIR/plugins/designer/ +cp $KDEDIR/lib/trinity/plugins/designer/kdewidgets.dll $QTDIR/plugins/designer/ cd $pwd |