diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-25 16:35:33 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-25 16:35:33 (GMT) |
| commit | 704b948a190a1b5dbf4e1c87fb1c633b91b1d51c (patch) | |
| tree | d10b4f67e1c8b1f0cf39361c8ec5da446ea34399 | |
| parent | 20aba4ffa2fdf7a7306424981049d430f7d88e5c (diff) | |
| parent | 29919f375e30c3ad2fb1d367e03b86302a7af81d (diff) | |
| download | Qt-704b948a190a1b5dbf4e1c87fb1c633b91b1d51c.zip Qt-704b948a190a1b5dbf4e1c87fb1c633b91b1d51c.tar.gz Qt-704b948a190a1b5dbf4e1c87fb1c633b91b1d51c.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Pass the right arguments to QApplication in GraphicsView benchmark.
| -rw-r--r-- | tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/main.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/main.cpp index b904f40..2c1274c 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/main.cpp +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/main.cpp @@ -751,7 +751,7 @@ int main(int argc, char *argv[]) aargv[aargc++] = argv[i]; } - QApplication app(argc, argv); + QApplication app(aargc, aargv); int returnValue = 0; if (settings.options() & Settings::ManualTest) { |