AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,921 Commits 4 Branches 0 Tags 339 MiB
C++ 84.2%
HTML 5.1%
C 4.2%
CMake 2.9%
Objective-C++ 2%
Other 1%
4f072e2d3d
Go to file
Jan Arve Saether 4f072e2d3d Fixed a bug where spans across empty cells got broken. 
If a row/column is only used only because of the spanning of an item,
the cell should be treated as it didn't exist. We keep track of this
with the "ignore" bit array.

The old code would always start from the row/column at position 1.
In the attached testcase this made the effectiveRowSpan become larger
than actually needed.

Task-number: QTBUG-30255

Change-Id: Ief0e7018ee8e5ee36272ce075a43312ffeac7b91
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
2013-04-03 14:52:25 +02:00
bin Merge remote-tracking branch 'gerrit/release' into stable 2013-03-21 08:49:01 +01:00
config.tests Whitespace cleanup: remove trailing whitespace 2013-03-16 20:22:50 +01:00
dist qmake/Win: disable "find highest lib version" feature by default 2013-03-26 21:44:15 +01:00
doc Doc: Added the Q_REVISION macro to the ignore list 2013-03-24 03:21:09 +01:00
examples improve openglwindow example a bit 2013-03-21 07:53:05 +01:00
lib Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
mkspecs iOS: Specify framework dependencies in the right place 2013-03-31 23:46:37 +02:00
qmake qmake/Win: disable "find highest lib version" feature by default 2013-03-26 21:44:15 +01:00
src Fixed a bug where spans across empty cells got broken. 2013-04-03 14:52:25 +02:00
tests Fixed a bug where spans across empty cells got broken. 2013-04-03 14:52:25 +02:00
tools Merge remote-tracking branch 'gerrit/release' into stable 2013-03-21 08:49:01 +01:00
util Whitespace cleanup: remove trailing whitespace 2013-03-16 20:22:50 +01:00
.gitattributes Update the git-archive export options 2012-09-07 15:39:31 +02:00
.gitignore Long live QLockFile 2013-03-05 06:26:33 +01:00
.qmake.conf require modules to define their version 2013-03-06 18:01:13 +01:00
.tag Update the git-archive export options 2012-09-07 15:39:31 +02:00
configure Revert "eglfs: Disable eglfs when evdev is not present" 2013-03-26 21:44:15 +01:00
configure.bat Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
header.BSD Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
header.FDL Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
header.LGPL Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
header.LGPL-ONLY Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
INSTALL fix links in INSTALL 2012-10-10 08:45:22 +02:00
LGPL_EXCEPTION.txt Change copyrights from Nokia to Digia 2012-09-22 19:20:11 +02:00
LICENSE.FDL Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
LICENSE.GPL Add the LICENSE.GPL file to the module referenced from license headers 2012-05-20 22:41:08 +02:00
LICENSE.LGPL Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
LICENSE.PREVIEW.COMMERCIAL Change copyrights from Nokia to Digia 2012-09-22 19:20:11 +02:00
qtbase.pro create tool pri file for syncqt 2013-02-11 18:00:12 +01:00
sync.profile Hide Harfbuzz from the outer world 2013-03-13 14:46:26 +01:00