summaryrefslogtreecommitdiffstats
path: root/tests/auto/qmake
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@nokia.com>2009-09-28 13:07:24 (GMT)
committerRichard Moe Gustavsen <richard.gustavsen@nokia.com>2009-09-28 13:07:24 (GMT)
commit62624c575bd784b36b1d080d32f168e0668ca15b (patch)
tree742d86e4f8a91d0ee49520963c4b6e8fe9b48d2e /tests/auto/qmake
parentb798fc523446b4b7c7e888f7ef504202730e6cb5 (diff)
downloadQt-62624c575bd784b36b1d080d32f168e0668ca15b.zip
Qt-62624c575bd784b36b1d080d32f168e0668ca15b.tar.gz
Qt-62624c575bd784b36b1d080d32f168e0668ca15b.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
Diffstat (limited to 'tests/auto/qmake')
-rw-r--r--tests/auto/qmake/testdata/prompt/prompt.pro2
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)