diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-07-17 14:34:10 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-22 19:52:06 +0200 |
| commit | 54987c6bf55b159d3ddb79461439700f6e0111f9 (patch) | |
| tree | 2e06885676051b3f87a203fdd35583a716ba9604 /tools | |
| parent | c9568da9697adc50b1417dff3e040aefb934522b (diff) | |
| download | qtbase-54987c6bf55b159d3ddb79461439700f6e0111f9.tar.gz qtbase-54987c6bf55b159d3ddb79461439700f6e0111f9.tar.bz2 qtbase-54987c6bf55b159d3ddb79461439700f6e0111f9.zip | |
default to -compile-examples
because of popular confusion.
the packaging scripts now need to use -no-compile-examples explicitly.
Task-number: QTBUG-32449
Change-Id: Iecab1f345afe21e540204fe69a2292ef932cbb61
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 5b62e8f106..a6376bbb7d 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -256,7 +256,7 @@ Configure::Configure(int& argc, char** argv) dictionary[ "BUILDDEV" ] = "no"; - dictionary[ "COMPILE_EXAMPLES" ] = "auto"; + dictionary[ "COMPILE_EXAMPLES" ] = "yes"; dictionary[ "C++11" ] = "auto"; @@ -1702,7 +1702,7 @@ bool Configure::displayHelp() desc( "-skip <module>", "Exclude an entire module from the build.\n"); - desc( "-compile-examples", "Compile examples even in a production build.\n"); + desc( "-no-compile-examples", "Install only the sources of examples.\n"); desc("WIDGETS", "no", "-no-widgets", "Disable Qt Widgets module.\n"); desc("GUI", "no", "-no-gui", "Disable Qt GUI module.\n"); @@ -1987,13 +1987,6 @@ QString Configure::defaultTo(const QString &option) && (!QFile::exists(sourcePath + "/.git"))) return "no"; - // Do not actually build the examples in production builds with -prefix, unless requested - if (option == "COMPILE_EXAMPLES" - && QDir::cleanPath(dictionary[ "QT_BUILD_TREE" ]) - != QDir::cleanPath(dictionary[ "QT_INSTALL_PREFIX" ]) - && dictionary[ "BUILDDEV" ] == "no") - return "no"; - return "yes"; } |