summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-10-19 22:33:29 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-10-19 22:33:29 (GMT)
commitae1cb61204530099f438656226a4b24449658203 (patch)
tree485a961f295ab0db5b60cdd62f6072ac2368dfe6 /configure
parent55bddd50925da27f7a106041db44c15057aac6c1 (diff)
parent02c15e6a8cdb0f8a0bb6ee36880877fe90334d69 (diff)
downloadQt-ae1cb61204530099f438656226a4b24449658203.zip
Qt-ae1cb61204530099f438656226a4b24449658203.tar.gz
Qt-ae1cb61204530099f438656226a4b24449658203.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts: tools/qdoc3/cppcodemarker.cpp
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure1
1 files changed, 0 insertions, 1 deletions
diff --git a/configure b/configure
index 7acf18a..0021697 100755
--- a/configure
+++ b/configure
@@ -2885,7 +2885,6 @@ fi
# pass on $CFG_SDK to the configure tests.
if [ '!' -z "$CFG_SDK" ]; then
MAC_CONFIG_TEST_COMMANDLINE="-sdk $CFG_SDK"
- echo "tests command line: $MAC_CONFIG_TEST_COMMANDLINE"
fi
# find the default framework value