diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-20 19:45:38 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-20 19:46:19 +0200 |
| commit | d671acd5b296b83440db9836a92189c501c87ff3 (patch) | |
| tree | bd9c1a000e17c70124c207666cfb3276b5518ffd /tests/auto/qlayout | |
| parent | 42f5786104f9eef9542df2c7469a03324978281d (diff) | |
| parent | 4f2138ecfbdc58e5cb5b0c7d762197ef69752957 (diff) | |
Merge remote branch 'staging/master' into refactor
Conflicts:
src/opengl/qgl_qpa.cpp
src/plugins/platforms/glxconvenience/qglxconvenience.cpp
src/plugins/platforms/platforms.pro
src/plugins/platforms/wayland/qwaylandwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.h
src/plugins/platforms/xcb/qxcbwindowsurface.cpp
src/widgets/kernel/qwidget_qpa.cpp
tests/auto/qvariant/tst_qvariant.cpp
Diffstat (limited to 'tests/auto/qlayout')
| -rw-r--r-- | tests/auto/qlayout/tst_qlayout.cpp | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/tests/auto/qlayout/tst_qlayout.cpp b/tests/auto/qlayout/tst_qlayout.cpp index 3090ebb684..f69a99c312 100644 --- a/tests/auto/qlayout/tst_qlayout.cpp +++ b/tests/auto/qlayout/tst_qlayout.cpp @@ -76,9 +76,6 @@ private slots: void geometry(); void smartMaxSize(); void setLayoutBugs(); -#ifdef QT3_SUPPORT - void task193350_sizeGrip(); -#endif void setContentsMargins(); void layoutItemRect(); void warnIfWrongParent(); @@ -185,16 +182,16 @@ void tst_QLayout::smartMaxSize() int expectedIndex = 0; int regressionCount = 0; - for (int p = 0; p < sizeof(policies)/sizeof(QSizePolicy::Policy); ++p) { + for (size_t p = 0; p < sizeof(policies)/sizeof(QSizePolicy::Policy); ++p) { QSizePolicy sizePolicy; sizePolicy.setHorizontalPolicy(policies[p]); - for (int min = 0; min < sizeof(sizeCombinations)/sizeof(int); ++min) { + for (size_t min = 0; min < sizeof(sizeCombinations)/sizeof(int); ++min) { int minSize = sizeCombinations[min]; - for (int max = 0; max < sizeof(sizeCombinations)/sizeof(int); ++max) { + for (size_t max = 0; max < sizeof(sizeCombinations)/sizeof(int); ++max) { int maxSize = sizeCombinations[max]; - for (int sh = 0; sh < sizeof(sizeCombinations)/sizeof(int); ++sh) { + for (size_t sh = 0; sh < sizeof(sizeCombinations)/sizeof(int); ++sh) { int sizeHint = sizeCombinations[sh]; - for (int a = 0; a < sizeof(alignments)/sizeof(int); ++a) { + for (size_t a = 0; a < sizeof(alignments)/sizeof(int); ++a) { Qt::Alignment align = alignments[a]; QSize sz = qSmartMaxSize(QSize(sizeHint, 1), QSize(minSize, 1), QSize(maxSize, 1), sizePolicy, align); int width = sz.width(); @@ -235,21 +232,6 @@ void tst_QLayout::setLayoutBugs() QVERIFY(containerWidget.layout() == hBoxLayout); } -#ifdef QT3_SUPPORT -void tst_QLayout::task193350_sizeGrip() -{ - QDialog dialog; - dialog.setSizeGripEnabled(true); - - QVBoxLayout* layout = new QVBoxLayout(&dialog); - layout->setAutoAdd(true); - new QLabel("Label", &dialog); - - dialog.show(); - QCOMPARE(layout->indexOf(qFindChild<QSizeGrip *>(&dialog)),-1); -} -#endif - class MyLayout : public QLayout { public: |