diff options
| author | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2009-09-28 13:07:24 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-28 13:39:45 (GMT) |
| commit | da8a3bb6e55117fd199de0c237cd2efe05fd7e52 (patch) | |
| tree | 3a2197b11135dee1a8f306d622b4f8501f4bffa3 | |
| parent | ac1b42cefbfde3a5f7fc510198f22098a7c7ae27 (diff) | |
| download | Qt-da8a3bb6e55117fd199de0c237cd2efe05fd7e52.zip Qt-da8a3bb6e55117fd199de0c237cd2efe05fd7e52.tar.gz Qt-da8a3bb6e55117fd199de0c237cd2efe05fd7e52.tar.bz2 | |
Mac: build issue (autotest stalls build)
When building Qt static on Mac, the test included actually stops
the build process, prompting the user for 'Promteroo?'
The reason is that configure runs qmake on all the tests inside
the test/auto directory, including the one that is meant for
testing qmake itself. In other words, this test should not
be qmake'ed when running configure, only when running the
qmake auto test. However, the qmake auto test does not run
the prompt test anymore either. So the solution for now
is to just comment out the test project as well.
Reviewed-by: alexis
(cherry picked from commit 62624c575bd784b36b1d080d32f168e0668ca15b)
| -rw-r--r-- | tests/auto/qmake/testdata/prompt/prompt.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qmake/testdata/prompt/prompt.pro b/tests/auto/qmake/testdata/prompt/prompt.pro index 02db4fe..238022c 100644 --- a/tests/auto/qmake/testdata/prompt/prompt.pro +++ b/tests/auto/qmake/testdata/prompt/prompt.pro @@ -1,2 +1,2 @@ -a = $$prompt(Prompteroo) +# a = $$prompt(Prompteroo) |