diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-04-02 13:24:59 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2017-04-04 06:46:25 +0000 |
| commit | 374ec0ba691e3cbcd7365778afdb59a7f9eb871d (patch) | |
| tree | bdebd9aa57fa3c6bc517583398b94c4b606c8983 | |
| parent | bc4b0a0ace7a0479b5f75c36cb46cb874aeaeb65 (diff) | |
| download | qttools-374ec0ba691e3cbcd7365778afdb59a7f9eb871d.tar.gz | |
Fix warning about uninitialized variables
If locateWidget returns false, the variables aren't initialized. So
initialize them with some values.
shared/layout.cpp:967:33: warning: ‘colspan’ may be used uninitialized in this function [-Wmaybe-uninitialized]
Change-Id: I27b55fdf514247549455fffd14b1ae64e242a38e
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | src/designer/src/lib/shared/layout.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/designer/src/lib/shared/layout.cpp b/src/designer/src/lib/shared/layout.cpp index 839f6a4ae..c845386f4 100644 --- a/src/designer/src/lib/shared/layout.cpp +++ b/src/designer/src/lib/shared/layout.cpp @@ -943,8 +943,10 @@ bool Grid::shrinkFormLayoutSpans() for (WidgetSet::const_iterator it = widgets.constBegin(); it != cend ; ++it) { QWidget *w = *it; int row, col, rowspan, colspan; - if (!locateWidget(w, row, col, rowspan, colspan)) + if (!locateWidget(w, row, col, rowspan, colspan)) { qDebug("ooops, widget '%s' does not fit in layout", w->objectName().toUtf8().constData()); + row = col = rowspan = colspan = 0; + } const int maxColSpan = col == 0 ? 2 : 1; const int newColSpan = qMin(colspan, maxColSpan); const int newRowSpan = qMin(rowspan, maxRowSpan); |