From 10308be19ef7fa44699562cc75946e7ea1fdf6b9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 Jan 2011 03:45:53 +0000 Subject: Revert automated changes Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro | 4 ++-- .../kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro | 8 ++++---- .../kstyles/thinkeramik/widget-engine/widget-engine.pro | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'win/pro_files/kstyles/thinkeramik') diff --git a/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro b/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro index f4ebff204..37e637ed7 100644 --- a/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro +++ b/win/pro_files/kstyles/thinkeramik/widget-engine/genembed.pro @@ -13,10 +13,10 @@ win32 { DESTDIR=. -tqcontains( KW_CONFIG, release ) { +contains( KW_CONFIG, release ) { TARGET = genembed_rel } -!tqcontains( KW_CONFIG, release ) { +!contains( KW_CONFIG, release ) { TARGET = genembed } diff --git a/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro b/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro index f45373c78..66346be7d 100644 --- a/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro +++ b/win/pro_files/kstyles/thinkeramik/widget-engine/thinkeramik_rel.pro @@ -4,8 +4,8 @@ TEMPLATE = lib unix { - INCLUDEPATH += tqmoc - #force tqfinding libraries in current dir (for installer, etc): + INCLUDEPATH += moc + #force finding libraries in current dir (for installer, etc): QMAKE_LFLAGS += -Wl,-rpath,. DEFINES += KDEFX_EXPORT= } @@ -42,8 +42,8 @@ SOURCES += \ ../../../kdefx/kpixmapeffect.cpp \ ../../../kdefx/kpixmap.cpp -system( tqmoc thinkeramik.h -o tqmoc/thinkeramik.moc ) -system( tqmoc ../../../kdefx/kstyle.h -o tqmoc/kstyle.moc ) +system( moc thinkeramik.h -o moc/thinkeramik.moc ) +system( moc ../../../kdefx/kstyle.h -o moc/kstyle.moc ) system( bash ./genemb.sh ) diff --git a/win/pro_files/kstyles/thinkeramik/widget-engine/widget-engine.pro b/win/pro_files/kstyles/thinkeramik/widget-engine/widget-engine.pro index 20c289549..41181415f 100644 --- a/win/pro_files/kstyles/thinkeramik/widget-engine/widget-engine.pro +++ b/win/pro_files/kstyles/thinkeramik/widget-engine/widget-engine.pro @@ -3,12 +3,12 @@ include( ../../common.pro ) TARGET = thinkeramik$$KDEBUG unix { - INCLUDEPATH += tqmoc - #force tqfinding libraries in current dir (for installer, etc): + INCLUDEPATH += moc + #force finding libraries in current dir (for installer, etc): QMAKE_LFLAGS += -Wl,-rpath,. } -system( bash ktqmoc ) +system( bash kmoc ) SOURCES = \ colorutil.cpp \ @@ -16,11 +16,11 @@ gradients.cpp \ thinkeramik.cpp \ pixmaploader.cpp -tqcontains( KW_CONFIG, release ) { +contains( KW_CONFIG, release ) { system( bash ./genemb.sh _rel ) } -!tqcontains( KW_CONFIG, release ) { +!contains( KW_CONFIG, release ) { system( bash ./genemb.sh ) } -- cgit v1.2.1