diff options
author | Frans Englich <frans.englich@nokia.com> | 2009-09-30 13:11:39 (GMT) |
---|---|---|
committer | Frans Englich <frans.englich@nokia.com> | 2009-09-30 13:11:39 (GMT) |
commit | 7c33e0f95789af1f6c091db89581f8a26b10682d (patch) | |
tree | cb8faa2ab6ce19c85a8c0c90dc852db08375868e /tests/auto/qmake/testdata/prompt/prompt.pro | |
parent | da935e9df4c63490a7d2a716236f1e781c2d75a6 (diff) | |
parent | c3ef2d3a6d9a6e35b05cbd8f370630d5dd85415e (diff) | |
download | Qt-7c33e0f95789af1f6c091db89581f8a26b10682d.zip Qt-7c33e0f95789af1f6c091db89581f8a26b10682d.tar.gz Qt-7c33e0f95789af1f6c091db89581f8a26b10682d.tar.bz2 |
Merge commit 'origin/4.6' into mmfphonon
Diffstat (limited to 'tests/auto/qmake/testdata/prompt/prompt.pro')
-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) |