diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-19 20:04:29 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-19 20:04:29 +1000 |
| commit | 77cd5455b200bf5a7d9fbc355f0fa7174630323f (patch) | |
| tree | b2c0754e5d26920a6bc8c20d3e5b869120630079 /tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.cpp | |
| parent | 6772f8802d9766750372317b55d032b3457837d8 (diff) | |
| parent | 1b92bb9bb216ed49ddb222cdd3f523dd8d640c2f (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Compile IPC tests.
Always call XInitThreads.
Remove redundant #ifdef's from benchmarks
Improve coding style of qdatastream test
Don't use Qt3Support in arthur test suite.
Remove Qt3Support code from QMenuBar autotest
Remove Qt3Support code from QSplitter autotest
Remove Qt3Support code from QSharedPointer autotest
Remove Qt3Support code from QComboBox autotest
Remove Qt3Support test code from accessibility autotest
tests: allow unstable tests to be marked with CONFIG+=insignificant_test
Diffstat (limited to 'tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.cpp')
| -rw-r--r-- | tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.cpp index ad73ca98f7..25acb02fef 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.cpp +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.cpp @@ -50,10 +50,8 @@ Label::Label(const QString& text, QGraphicsItem *parent) setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); setContentsMargins(0, 0, 0, 0); setText(text); -#if QT_VERSION >= 0x040600 // This flag was introduced in Qt 4.6. setFlag(QGraphicsItem::ItemHasNoContents, true); -#endif } Label::~Label() |