Changeset 651 for trunk/src/gui/graphicsview/qgridlayoutengine.cpp

Timestamp:

Mar 8, 2010, 12:52:58 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.2 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/graphicsview/qgridlayoutengine.cpp (modified) (2 diffs)

trunk/src/gui/graphicsview/qgridlayoutengine.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -183 +183 @@
 
         for (int j = 0; j < NSizes; ++j) {
-            qreal extra = compare(totalBox, box, j);
+            qreal extra = compare(ox, j);
             if (extra > 0.0) {
-                calculateGeometries(start, end, totalBox.q_sizes(j), dummy.data(), newSizes.data(),
+                calculateGeometries(start, end, ox.q_sizes(j), dummy.data(), newSizes.data(),
                                     0, totalBox);