diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-07-10 02:47:19 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-07-10 02:47:19 (GMT) |
| commit | 5173a42be2d0121c0f33217cc4d8399070a8aa3b (patch) | |
| tree | 0f8b6cde906ae1d014e730506c2a58fbe2b6079c /tools/configure | |
| parent | 883da42f7c75775502c818aa456c8576d8457ff8 (diff) | |
| parent | 0d156972b868c951fa33f21735040ab1e7a76f21 (diff) | |
| download | Qt-5173a42be2d0121c0f33217cc4d8399070a8aa3b.zip Qt-5173a42be2d0121c0f33217cc4d8399070a8aa3b.tar.gz Qt-5173a42be2d0121c0f33217cc4d8399070a8aa3b.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure.exe
src/corelib/kernel/qmetaobject.cpp
tools/qdoc3/generator.cpp
tools/qdoc3/test/qt-cpp-ignore.qdocconf
tools/qdoc3/test/qt-inc.qdocconf
Diffstat (limited to 'tools/configure')
| -rw-r--r-- | tools/configure/configureapp.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 9a8b4bc..2a41b92 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1140,6 +1140,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 ) { @@ -1526,7 +1530,7 @@ bool Configure::displayHelp() desc( "-graphicssystem <sys>", "Specify which graphicssystem should be used.\n" "Available values for <sys>:"); desc("GRAPHICS_SYSTEM", "raster", "", " raster - Software rasterizer", ' '); - desc("GRAPHICS_SYSTEM", "opengl", "", " opengl - Using OpenGL accelleration, experimental!", ' '); + desc("GRAPHICS_SYSTEM", "opengl", "", " opengl - Using OpenGL acceleration, experimental!", ' '); desc( "-help, -h, -?", "Display this information.\n"); @@ -2004,7 +2008,6 @@ bool Configure::verifyConfiguration() no-gif gif dll staticlib - internal nocrosscompiler GNUmake largefile |