summaryrefslogtreecommitdiffstats
path: root/test/QT
diff options
context:
space:
mode:
authorRussel Winder <russel@winder.org.uk>2016-01-01 15:59:23 (GMT)
committerRussel Winder <russel@winder.org.uk>2016-01-01 15:59:23 (GMT)
commit3f637329635c089bdca30bb4b0e23334d12866b3 (patch)
tree4b30c7fe89b85380b9c825c906e2745c4d7c96d1 /test/QT
parent7b68ccb54e7b4d2200f8ac813eb6f8b2ae3654eb (diff)
downloadSCons-3f637329635c089bdca30bb4b0e23334d12866b3.zip
SCons-3f637329635c089bdca30bb4b0e23334d12866b3.tar.gz
SCons-3f637329635c089bdca30bb4b0e23334d12866b3.tar.bz2
Some more statement to function transforms.
Diffstat (limited to 'test/QT')
-rw-r--r--test/QT/QTFLAGS.py8
-rw-r--r--test/QT/manual.py6
2 files changed, 7 insertions, 7 deletions
diff --git a/test/QT/QTFLAGS.py b/test/QT/QTFLAGS.py
index 008397a..f6aa00f 100644
--- a/test/QT/QTFLAGS.py
+++ b/test/QT/QTFLAGS.py
@@ -136,7 +136,7 @@ int main() {
""")
test.run(chdir = 'work1', arguments = "mytest" + _exe)
-
+
test.must_exist(['work1', 'mmmmocFromH.cxx'],
['work1', 'mocmocFromCpp.inl'],
['work1', 'an_ui_file.cxx'],
@@ -168,15 +168,15 @@ env1 = Environment(tools=['qt'],
cpppath = env1.subst('$CPPPATH')
if os.path.normpath(cpppath) != os.path.join(r'%(QTDIR)s', 'h64'):
- print cpppath
+ print(cpppath)
Exit(1)
libpath = env1.subst('$LIBPATH')
if os.path.normpath(libpath) != os.path.join(r'%(QTDIR)s', 'lib64'):
- print libpath
+ print(libpath)
Exit(2)
qt_moc = env1.subst('$QT_MOC')
if os.path.normpath(qt_moc) != os.path.join(r'%(QTDIR)s', 'bin64', 'moc'):
- print qt_moc
+ print(qt_moc)
Exit(3)
env2 = Environment(tools=['default', 'qt'],
diff --git a/test/QT/manual.py b/test/QT/manual.py
index d911fb3..1f140ae 100644
--- a/test/QT/manual.py
+++ b/test/QT/manual.py
@@ -58,7 +58,7 @@ env.Ignore( moc, moc )
sources.extend(env.Uic(['include/uic_fff.hpp', 'fff.cpp', 'fff.moc.cpp'],
'ui/fff.ui')[1:])
-print list(map(str,sources))
+print(list(map(str,sources)))
env.Program(target='aaa',
source=sources,
CPPPATH=['$CPPPATH', './include'],
@@ -68,7 +68,7 @@ env.Program(target='aaa',
test.write('aaa.cpp', r"""
#include "aaa.h"
""")
-
+
test.write(['include', 'aaa.h'], r"""
#include "my_qobject.h"
void aaa(void) Q_OBJECT;
@@ -91,7 +91,7 @@ void ccc(void)
test.write('ddd.cpp', r"""
#include "ddd.h"
""")
-
+
test.write(['include', 'ddd.h'], r"""
#include "my_qobject.h"
void ddd(void) Q_OBJECT;