projects
/
platform
/
upstream
/
qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9ae3e24
)
Make minimum FBO size 1x1 on newer OSX.
author
Gunnar Sletta
<gunnar@sletta.org>
Wed, 27 Aug 2014 05:35:24 +0000
(07:35 +0200)
committer
Gunnar Sletta
<gunnar@sletta.org>
Wed, 27 Aug 2014 11:15:03 +0000
(13:15 +0200)
This problem existed on 10.6, but is not reproducible on newer
MacBookPros, so disable it for 10.8 and up.
Change-Id: I0ae216c8e2307df5f77a783ec2d2031bf12ccbf2
Task-number: QTBUG-20193
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
src/quick/scenegraph/qsgcontext.cpp
patch
|
blob
|
history
diff --git
a/src/quick/scenegraph/qsgcontext.cpp
b/src/quick/scenegraph/qsgcontext.cpp
index
0bca81d
..
fdf2708
100644
(file)
--- a/
src/quick/scenegraph/qsgcontext.cpp
+++ b/
src/quick/scenegraph/qsgcontext.cpp
@@
-352,10
+352,10
@@
QSurfaceFormat QSGContext::defaultSurfaceFormat() const
QSize QSGContext::minimumFBOSize() const
{
#ifdef Q_OS_MAC
- return QSize(33, 33);
-#else
- return QSize(1, 1);
+ if (QSysInfo::MacintoshVersion < QSysInfo::MV_10_8)
+ return QSize(33, 33);
#endif
+ return QSize(1, 1);
}