diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-29 12:35:34 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-29 12:35:34 (GMT) |
| commit | 82ad1edea9fd6d6955ab9e3f661c625f7ba5ed78 (patch) | |
| tree | 58934af99acbd49c4f9bedf66fc4a94d784048ec /tests/auto/qmake/testdata | |
| parent | 63be458a64d6f88333cd921e587b2c651acb122f (diff) | |
| parent | 640ae542541b66a5da85ce76309f9595ed2c8bf3 (diff) | |
| download | Qt-82ad1edea9fd6d6955ab9e3f661c625f7ba5ed78.zip Qt-82ad1edea9fd6d6955ab9e3f661c625f7ba5ed78.tar.gz Qt-82ad1edea9fd6d6955ab9e3f661c625f7ba5ed78.tar.bz2 | |
Merge branch '4.5' into 4.6
Conflicts:
doc/src/platform-notes.qdoc
src/3rdparty/webkit/WebKit/qt/Api/qwebpluginfactory.cpp
src/gui/graphicsview/qgraphicsitem.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
Diffstat (limited to 'tests/auto/qmake/testdata')
| -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) |