diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-21 14:53:30 -0500 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-11-17 18:35:37 +0100 |
commit | 8a79684ebfdf704054f40a72ee5e7bf2ebe06a13 (patch) | |
tree | a9e2086e09d84560bc047a833736019b53ddef1c /parts/appwizard | |
parent | 3c15d3e1bbdb5897c98244a39785be1c657ff7ef (diff) | |
download | tdevelop-8a79684ebfdf704054f40a72ee5e7bf2ebe06a13.tar.gz tdevelop-8a79684ebfdf704054f40a72ee5e7bf2ebe06a13.zip |
Fix inadvertent tqt changes.
(cherry picked from commit 3d1c7581ff395fc373ca4b8bd8f65b540b37b12f)
Diffstat (limited to 'parts/appwizard')
-rw-r--r-- | parts/appwizard/common/scons/admin/kde.py | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/parts/appwizard/common/scons/admin/kde.py b/parts/appwizard/common/scons/admin/kde.py index f74943dd..f1c3a0f9 100644 --- a/parts/appwizard/common/scons/admin/kde.py +++ b/parts/appwizard/common/scons/admin/kde.py @@ -81,7 +81,7 @@ def detect_kde(env): env.Exit(1) env['QTDIR'] = qtdir.strip() - ## Find the necessary programs uic and tqmoc + ## Find the necessary programs uic and moc print "Checking for uic : ", uic = qtdir + "/bin/uic" if os.path.isfile(uic): @@ -99,21 +99,21 @@ def detect_kde(env): env.Exit(1) env['QT_UIC'] = uic - print "Checking for tqmoc : ", - tqmoc = qtdir + "/bin/tqmoc" - if os.path.isfile(tqmoc): - print GREEN + "tqmoc was found as " + tqmoc + NORMAL + print "Checking for moc : ", + moc = qtdir + "/bin/moc" + if os.path.isfile(moc): + print GREEN + "moc was found as " + moc + NORMAL else: - tqmoc = os.popen("which tqmoc 2>/dev/null").read().strip() - if len(tqmoc): - print YELLOW + "tqmoc was found as " + tqmoc + NORMAL - elif os.path.isfile("/usr/share/qt3/bin/tqmoc"): - tqmoc = "/usr/share/qt3/bin/tqmoc" - print YELLOW + "tqmoc was found as " + tqmoc + NORMAL + moc = os.popen("which moc 2>/dev/null").read().strip() + if len(moc): + print YELLOW + "moc was found as " + moc + NORMAL + elif os.path.isfile("/usr/share/qt3/bin/moc"): + moc = "/usr/share/qt3/bin/moc" + print YELLOW + "moc was found as " + moc + NORMAL else: - print RED + "tqmoc was not found - set QTDIR or put it in your PATH ?" + NORMAL + print RED + "moc was not found - set QTDIR or put it in your PATH ?" + NORMAL env.Exit(1) - env['QT_TQMOC'] = tqmoc + env['QT_TQMOC'] = moc ## check for the qt and kde includes print "Checking for the qt includes : ", @@ -204,7 +204,7 @@ def detect_kde(env): env['QTLIBPATH']=qtlibs def generate(env): - """"Set up the qt and kde environment and builders - the tqmoc part is difficult to understand """ + """"Set up the qt and kde environment and builders - the moc part is difficult to understand """ if env['HELP']: print """ """+BOLD+"""*** KDE options *** @@ -270,7 +270,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt # The following is kind of hacky to get builders working properly (FIXME) ?? objBuilderEnv = objBuilder.env objBuilder.env = env - tqmocBuilderEnv = env.Moc.env + mocBuilderEnv = env.Moc.env env.Moc.env = env # make a deep copy for the result; MocH objects will be appended @@ -323,22 +323,22 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt if not h and qtdebug: print "scons: qt: no header for '%s'." % (str(cpp)) if h and q_object_search.search(h_contents): - # h file with the Q_OBJECT macro found -> add .tqmoc or _tqmoc.cpp file - tqmoc_cpp = None + # h file with the Q_OBJECT macro found -> add .moc or _moc.cpp file + moc_cpp = None if env.has_key('NOTQMOCSCAN'): - tqmoc_cpp = env.Moc(h) + moc_cpp = env.Moc(h) else: - reg = '\n\s*#include\s*("|<)'+splitext(cpp.name)[0]+'.tqmoc("|>)' + reg = '\n\s*#include\s*("|<)'+splitext(cpp.name)[0]+'.moc("|>)' meta_object_search = re.compile(reg) if meta_object_search.search(cpp_contents): - tqmoc_cpp = env.Moc(h) + moc_cpp = env.Moc(h) else: - tqmoc_cpp = env.Moccpp(h) - tqmoc_o = objBuilder(tqmoc_cpp) - out_sources.append(tqmoc_o) + moc_cpp = env.Moccpp(h) + moc_o = objBuilder(moc_cpp) + out_sources.append(moc_o) if qtdebug: - print "scons: qt: found Q_OBJECT macro in '%s', tqmoc'ing to '%s'" % (str(h), str(tqmoc_cpp[0])) + print "scons: qt: found Q_OBJECT macro in '%s', moc'ing to '%s'" % (str(h), str(moc_cpp[0])) if cpp and q_object_search.search(cpp_contents): print "error, bksys cannot handle cpp files with Q_OBJECT classes" @@ -347,7 +347,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt # restore the original env attributes (FIXME) objBuilder.env = objBuilderEnv - env.Moc.env = tqmocBuilderEnv + env.Moc.env = mocBuilderEnv return (target, out_sources) @@ -368,8 +368,8 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt ('QTDIR', 'root of qt directory'), ('QTLIBPATH', 'path to the qt libraries'), ('QTINCLUDEPATH', 'path to the qt includes'), - ('QT_UIC', 'tqmoc directory'), - ('QT_TQMOC', 'tqmoc executable command'), + ('QT_UIC', 'moc directory'), + ('QT_TQMOC', 'moc executable command'), ('QTPLUGINS', 'uic executable command'), ('KDEDIR', 'root of kde directory'), ('KDELIBPATH', 'path to the kde libs'), @@ -413,7 +413,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt env['QT_UICIMPLSUFFIX'] = '.cpp' env['QT_TQMOCHPREFIX'] = '' - env['QT_TQMOCHSUFFIX'] = '.tqmoc' + env['QT_TQMOCHSUFFIX'] = '.moc' env['KDE_KCFG_IMPLPREFIX'] = '' env['KDE_KCFG_IMPL_HSUFFIX'] = '.h' env['KDE_KCFG_IMPL_CSUFFIX'] = '.cpp' @@ -424,10 +424,10 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt ## ui file processing def uic_processing(target, source, env): inc_kde = '#include <klocale.h>\n#include <kdialog.h>\n' - inc_tqmoc = '#include "%s"\n' % target[2].name + inc_moc = '#include "%s"\n' % target[2].name comp_h = '$QT_UIC $QT_UIC_HFLAGS -o %s %s' % (target[0].path, source[0].path) comp_c = '$QT_UIC $QT_UIC_CFLAGS -impl %s %s' % (target[0].path, source[0].path) - comp_tqmoc = '$QT_TQMOC -o %s %s' % (target[2].path, target[0].path) + comp_moc = '$QT_TQMOC -o %s %s' % (target[2].path, target[0].path) ret = env.Execute(comp_h) if ret: @@ -442,10 +442,10 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt return ret dest = open( target[1].path, "a" ) - dest.write(inc_tqmoc) + dest.write(inc_moc) dest.close() - ret = env.Execute( comp_tqmoc ) + ret = env.Execute( comp_moc ) return ret def uicEmitter(target, source, env): @@ -459,7 +459,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt env.subst('$QT_UICIMPLPREFIX'), env.subst('$QT_UICIMPLSUFFIX'))) if len(target) < 3: - # third target is .tqmoc file + # third target is .moc file target.append(adjustixes(bs, env.subst('$QT_TQMOCHPREFIX'), env.subst('$QT_TQMOCHSUFFIX'))) @@ -471,17 +471,17 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt suffix = '.h', src_suffix = '.ui') - ## tqmoc file processing + ## moc file processing env['QT_TQMOCCOM'] = ('$QT_TQMOC -o ${TARGETS[0]} $SOURCE') TQMOC_BUILDER = Builder( action = '$QT_TQMOCCOM', - suffix = '.tqmoc', + suffix = '.moc', src_suffix = '.h') TQMOCCPP_BUILDER = Builder( action = '$QT_TQMOCCOM', - suffix = '_tqmoc.cpp', + suffix = '_moc.cpp', src_suffix = '.h') ## kcfg file processing @@ -596,7 +596,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt static_obj.src_builder.append('Transfiles') shared_obj.src_builder.append('Transfiles') - ## Find the files to tqmoc, dcop, and link against kde and qt + ## Find the files to moc, dcop, and link against kde and qt env.AppendUnique(PROGEMITTER = [MetasourcesStatic], SHLIBEMITTER=[MetasourcesShared], LIBEMITTER =[MetasourcesStatic]) ## Handy helpers for building kde programs @@ -631,9 +631,9 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt if ext in skel_ext: lenv.Dcop(bs+'.h') src.append(bs+'_skel.cpp') - elif ext == ".tqmoch": + elif ext == ".moch": lenv.Moccpp(bs+'.h') - src.append(bs+'_tqmoc.cpp') + src.append(bs+'_moc.cpp') else: src.append(file) |