diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-06 16:19:14 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-06 16:50:03 +0200 |
| commit | 1326cd15f7ba985551f0fddc717e3bfc01ddda85 (patch) | |
| tree | 024eb871ed5f4e8c02e21412475e6e9929a2b030 /src/corelib/tools/qsize.cpp | |
| parent | fe70367fe06984d1ac84cc276ca3fd3edc4193c7 (diff) | |
| parent | beb7258a56b6ec76531b73cc07ee30132a3f548f (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
mkspecs/qnx-x86-qcc/qplatformdefs.h
src/corelib/global/qglobal.h
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qgl.cpp
src/opengl/qglpixelbuffer.cpp
src/opengl/qglshaderprogram.cpp
tests/auto/opengl/qglthreads/tst_qglthreads.cpp
Change-Id: Iaba137884d3526a139000ca26fee02bb27b5cdb5
Diffstat (limited to 'src/corelib/tools/qsize.cpp')
| -rw-r--r-- | src/corelib/tools/qsize.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qsize.cpp b/src/corelib/tools/qsize.cpp index da447157ff..03966ab1d6 100644 --- a/src/corelib/tools/qsize.cpp +++ b/src/corelib/tools/qsize.cpp @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE width and height can be swapped using the transpose() function. The isValid() function determines if a size is valid (a valid size - has both width and height greater than zero). The isEmpty() + has both width and height greater than or equal to zero). The isEmpty() function returns \c true if either of the width and height is less than, or equal to, zero, while the isNull() function returns \c true only if both the width and the height is zero. |