diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-07-08 00:18:56 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-07-09 04:21:39 (GMT) |
| commit | bae8bc5d23946036b2c1079fc6f1b3bceeaa19ca (patch) | |
| tree | 1a303cf6aa958bd984c0ffb885ff007e32ce2c83 | |
| parent | 3e50d680a37401c05d753982eb5d43c0f1225f63 (diff) | |
| download | Qt-bae8bc5d23946036b2c1079fc6f1b3bceeaa19ca.zip Qt-bae8bc5d23946036b2c1079fc6f1b3bceeaa19ca.tar.gz Qt-bae8bc5d23946036b2c1079fc6f1b3bceeaa19ca.tar.bz2 | |
Disable private unit tests when Qt is configured without
-developer-build, part 1.
Adds QT_CONFIG+=private_tests to qconfig.pri when Qt is configured
with -developer-build.
Reviewed-by: Michael Goddard
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 5 |
2 files changed, 7 insertions, 2 deletions
@@ -6256,7 +6256,6 @@ esac # debug release # dll staticlib # -# internal # nocrosscompiler # GNUmake # largefile @@ -6736,6 +6735,9 @@ fi if [ "$PLATFORM_MAC" = "yes" ]; then QT_CONFIG="$QT_CONFIG $CFG_MAC_ARCHS" fi +if [ "$CFG_DEV" = "yes" ]; then + QT_CONFIG="$QT_CONFIG private_tests" +fi # Make the application arch follow the Qt arch for single arch builds. # (for multiple-arch builds, set CONFIG manually in the application .pro file) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index ce9fe6b..80cfc64 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1135,6 +1135,10 @@ void Configure::parseCmdLine() useUnixSeparators = (dictionary["QMAKESPEC"] == "win32-g++"); + // Allow tests for private classes to be compiled against internal builds + if (dictionary["BUILDDEV"] == "yes") + qtConfig += "private_tests"; + #if !defined(EVAL) for( QStringList::Iterator dis = disabledModules.begin(); dis != disabledModules.end(); ++dis ) { @@ -1997,7 +2001,6 @@ bool Configure::verifyConfiguration() no-gif gif dll staticlib - internal nocrosscompiler GNUmake largefile |