| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
into kinetic-declarativeui
Conflicts:
src/opengl/qglpixmapfilter.cpp
|
| | |
|
|\ \
| | |
| | |
| | | |
kinetic-declarativeui
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/gui/painting/qbackingstore.cpp
src/gui/painting/qwindowsurface_raster.cpp
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: nrc
|
|\ \ \ \
| |/ / /
| | | |
| | | | |
kinetic-declarativeui
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/gui/kernel/qcocoaview_mac_p.h
src/gui/widgets/qmainwindow.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
In 4.4 alphaMapForGlyph() would return valid images for any font size,
but this was changed in 4.5, forcing us to use the path fallback
instead. This lead to non-antialiased fonts when not using a
multisample-enabled GL format. This patch re-introduces the
alphaMapForGlyph() fallback in QFontEngine from 4.4 which uses the
raster paint engine to draw the glyph.
Task-number: 247083
Reviewed-by: Trond
|
|\ \ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into kinetic-declarativeui
Conflicts:
demos/boxes/scene.cpp
src/opengl/qglpixmapfilter.cpp
src/opengl/qglshaderprogram.cpp
src/opengl/qglshaderprogram.h
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: trustme
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: trustme
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: trustme
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: trustme
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The shader compilers also report warnings, so it is more appropriate
to call the string a log.
Reviewed-by: trustme
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Rhys Weatherley
|
| |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/rweathers-shaderprograms into shader-api
Conflicts:
src/gui/math3d/math3d.pri
src/gui/math3d/qgenericmatrix.cpp
src/gui/math3d/qgenericmatrix.h
src/gui/math3d/qmatrix4x4.cpp
src/gui/math3d/qmatrix4x4.h
src/gui/math3d/qquaternion.cpp
src/gui/math3d/qquaternion.h
src/gui/math3d/qvector2d.cpp
src/gui/math3d/qvector2d.h
src/gui/math3d/qvector3d.cpp
src/gui/math3d/qvector3d.h
src/gui/math3d/qvector4d.cpp
src/gui/math3d/qvector4d.h
src/opengl/opengl.pro
tests/auto/math3d/math3d.pro
tests/auto/math3d/qmatrixnxn/tst_qmatrixnxn.cpp
tests/auto/math3d/qquaternion/tst_qquaternion.cpp
tests/auto/math3d/qvectornd/tst_qvectornd.cpp
tests/auto/math3d/shared/math3dincludes.h
|
| | | | |
|
| | | | |
|
| | | | |
|
|\ \ \ \
| |/ / /
| | | |
| | | | |
kinetic-declarativeui
|
| |\ \ \
| | | |/
| | |/| |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: Related to 241466
Reviewed-by: Samuel
|
|\ \ \ \
| |/ / /
| | | |
| | | | |
kinetic-declarativeui
|
| |\ \ \
| | |/ / |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QGLWidget does not support partial updates unless the context is
single buffered and auto-fill background is disabled. The problem
was that QPaintEvent::region() returned the requested update region
without taking into account the limitation of QGLWidget. If QGLWidget
doesn't support partial updates, it means everything has to be updated,
and QPaintEvent::region() must return the whole widget rect.
Auto test included.
Task-number: 241785
Reviewed-by: Trond
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/corelib/global/qfeatures.h
src/gui/painting/qtransform.cpp
util/scripts/make_qfeatures_dot_h
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Thiago
|
| | | |
| | | |
| | | |
| | | | |
I've temporarily commented out the body of qguivariantanimation.cpp so we can compile.
|
|\ \ \ \
| |/ / / |
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Use painter paths instead of rectangles for perspective transformed
rects, as the rectangles might have been clipped.
Task-number: 251485
Reviewed-by: Trond
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Mac/Cocoa.
Check if the view is visible before attaching it to a context.
Task-number: related to 250066
Reviewed-by: Norwegian Rock Cat
BT: yes
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
glpixmapfilter should not be compiled for OpenGL ES 2.0 on nay platform
Reviewed-by: Tom Cooksey
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The NSOpenGLContext seems to be tied to the window. So if the view
changes from one window to another, the OpenGL context needs to be
cleared. We can do this by hooking into the viewWillChangeWindow and
viewDidChangeWindow events and clear and reset the drawable
respectively. We also found out that QCocoaOpenGLView was not being used
at all, so just remove it to get rid of any confusion.
Task-number: 250066
Reviewed-by: Trond
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Implement a manual fast scale, so that we can do a scale, swizzle and
mirror in the same loop without any temporary image copies.
This potentially increases texture uploads on embedded hw with a factor
of 10.
Reviewed-by: Samuel
|
|/ / / |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Mac/Cocoa.
Check if the view is visible before attaching it to a context.
Task-number: related to 250066
Reviewed-by: Norwegian Rock Cat
BT: yes
|
| | |
| | |
| | |
| | |
| | |
| | | |
glpixmapfilter should not be compiled for OpenGL ES 2.0 on nay platform
Reviewed-by: Tom Cooksey
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The NSOpenGLContext seems to be tied to the window. So if the view
changes from one window to another, the OpenGL context needs to be
cleared. We can do this by hooking into the viewWillChangeWindow and
viewDidChangeWindow events and clear and reset the drawable
respectively. We also found out that QCocoaOpenGLView was not being used
at all, so just remove it to get rid of any confusion.
Task-number: 250066
Reviewed-by: Trond
|
|\ \ \
| |/ /
| | |
| | |
| | | |
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QGLPixelBuffer::generateDynamicTexture() will bind the texture to the
pbuffer regardless. Why this works on Carbon is a mystery, but if we're
to follow our own docs, we should NOT bind the texture to the pbuffer
by default. An explicit call to ::bindToDynamicTexture() is required for
that.
Task-number: 250664
Reviewed-by: Samuel
BT: yes
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
with Cocoa support on Mac.
The Cocoa API doesn't have a concept of Z-ordering of widgets, and it's
implemented by reordering the widget hierarchy for normal widgets. This
does unfortunately not work for GL widgets, and it's not supported by
Apple. This apparently work with the Carbon AGL API though.
Task-number: 244890
Reviewed-by: Gunnar Sletta
BT: yes
|
| | |
| | |
| | |
| | | |
Reviewed-by: trustme
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The function was added in fde7f3d03782c801901f511131458d6fcb1021a5
and we believe qFuzzyIsNull is a better naming and more in line
with qFuzzyCompare.
Reviewed-by: Lars Knoll
Reviewed-by: nrc
Reviewed-by: Samuel
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
See also fde7f3d03782c801901f511131458d6fcb1021a5
Reviewed-by: Olivier
Reviewed-by: Samuel
|
| | |
| | |
| | |
| | | |
Reviewed-by: trustme
|
|\ \ \
| |/ / |
|
| | |
| | |
| | |
| | | |
Reviewed-by: Kim
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
tools/linguist/lupdate/qscript.cpp
tools/linguist/lupdate/qscript.g
tools/linguist/lupdate/ui.cpp
tools/linguist/shared/cpp.cpp
tools/linguist/shared/qph.cpp
tools/linguist/shared/translator.h
|
| |/
| |
| |
| |
| |
| |
| | |
Check for Qt::NoBrush and return early in the composite() function.
Task-number: 249628
Reviewed-by: Trond
|