From d2627113ba347e79699e280edcd0813265ae780f Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 5 Jul 2011 19:56:36 +0000 Subject: TQt4 port kstreamripper This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kstreamripper@1239914 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kde.py | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'kde.py') diff --git a/kde.py b/kde.py index b08dac1..783f727 100644 --- a/kde.py +++ b/kde.py @@ -93,21 +93,21 @@ def detect_kde(env): env.Exit(1) env['QTDIR'] = qtdir.strip() - ## Find the necessary programs uic and moc - print "Checking for uic : ", - uic = qtdir + "/bin/uic" + ## Find the necessary programs uic-tqt and moc + print "Checking for uic-tqt : ", + uic = qtdir + "/bin/uic-tqt" if os.path.isfile(uic): - print GREEN+"uic was found as "+uic+NORMAL + print GREEN+"uic-tqt was found as "+uic+NORMAL else: - uic = os.popen("which uic 2>/dev/null").read().strip() + uic = os.popen("which uic-tqt 2>/dev/null").read().strip() if len(uic): - print YELLOW+"uic was found as "+uic+NORMAL + print YELLOW+"uic-tqt was found as "+uic+NORMAL else: - uic = os.popen("which uic 2>/dev/null").read().strip() + uic = os.popen("which uic-tqt 2>/dev/null").read().strip() if len(uic): - print YELLOW+"uic was found as "+uic+NORMAL + print YELLOW+"uic-tqt was found as "+uic+NORMAL else: - print RED+"uic was not found - set QTDIR put it in your PATH ?"+NORMAL + print RED+"uic-tqt was not found - set QTDIR put it in your PATH ?"+NORMAL env.Exit(1) env['QT_UIC'] = uic @@ -141,6 +141,10 @@ def detect_kde(env): # Debian probably print YELLOW + "the qt headers were found in /usr/include/qt3/ " + NORMAL qtincludes = "/usr/include/qt3" + elif os.path.isfile("/usr/include/qt4/Qt/qglobal.h"): + # Debian probably + print YELLOW + "the qt headers were found in /usr/include/qt4/ " + NORMAL + qtincludes = "/usr/include/qt4" else: print RED + "the qt headers were not found" + NORMAL env.Exit(1) @@ -424,7 +428,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt env['QT_DEBUG'] = 0 env['QT_UIC_HFLAGS'] = '-L $QTPLUGINS -nounload' env['QT_UIC_CFLAGS'] = '$QT_UIC_HFLAGS -tr tr2i18n' - env['QT_LIBS'] = 'qt-mt' + env['QT_LIBS'] = 'tqt' env['QT_UICIMPLPREFIX'] = '' env['QT_UICIMPLSUFFIX'] = '.cpp' -- cgit v1.2.3