| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qapplication_win.cpp
src/gui/kernel/qwidget.cpp
src/gui/text/qfontengine_ft.cpp
|
| |
| |
| |
| | |
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This reverts commit 6155050f68cc86c445552da61a5f240c16f5e2cd.
The GL_ARB_ES2_compatibility extension does not mention the lowp,
mediump or highp keywords.
Task-number: QTBUG-14384
Reviewed-by: Samuel
Reviewed-by: Prasanth
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is a backport of 3874cd95e203da40d5205ef6455d7f56cba6923a which
was committed to qt:master. Since the patch that originally exposed
the bug was added to 4.7.2, this patch is required there as well.
Bug is visible when resizing the glyph cache on devices where
QGLContext::brokenFBOReadback defaults to true, or by setting this to
true on desktop.
Reviewed-by: Gunnar
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msbuild_objectmodel.h
qmake/generators/win32/msvc_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
src/corelib/arch/qatomic_arm.h
tests/auto/qglthreads/tst_qglthreads.cpp
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Adding a threshold for partial updates.
Fixed arm X11 build.
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 841
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
On OSX AssertMacros.h header has macro called verify() and
QRBTree::verify() function was substituted by this macro.
On Windows/Mingw includes need to point to exported private
include folder.
Reviewed-by: Kim
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
for some reason rvct didn't catch that.
Reviewed-by: TRUSTME
|
| | |\ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed library ordering when linking to qtmain.
Made javascriptcore depend on corelib.
Enable QtOpenGL vector path caching on Symbian/IVE3
Made scripttools disabled on Symbian by default, like on Windows.
Got rid of "No such directory" warning when shadow building.
Added qmake check for presence of RHttpDownloadMgr header
Fixed crash on startup in Symbian debug build
fixed hybrid heap Symbian udeb build issues
qmediaplayer: show buffer status of 0%
Progressive download in Phonon MMF backend: integrated with player
Progressive download in Phonon MMF backend: added download managers
Remove partial upgrade deployment generation for Webkit
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
IVE3 doesn't support UNSIGNED_INT <type> index values in DrawElements.
This patch checks if GL_OES_element_index_uint extensions is
supported and determines DrawElement indices type based on that.
On desktop environment UNSIGNED_INT is always supported.
Task-number: QTBUG-13563
Reviewed-by: Gunnar
|
| | |\ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (24 commits)
Stabilize tst_QGraphicsWidget::QT_BUG_13865_doublePaintWhenAddingASubItem
Fixed accessing freed memory in raster engine.
Build fix for -qtnamespace.
Fixed parsing of SVGs with absolute font sizes.
Moving QPdf::stripSpecialCharacter to fontengine
Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine"
Fixed a layout issue where you could get NaN as dimensions
QTextCodec: Fix valgrind warning when using QTextCodec in destructions functions
Fix double painting when adding an item into a linear layout
Fixed antialiased rasterization bug in raster engine.
Fixed potential crash when loading corrupt GIFs.
Work around an ATI driver problem with mutli-sampled pbuffers.
tst_qstatemachine.cpp: fix compilation with Sun Studio
Fixed regression in clipping.qps autotest on 64-bit.
Fixed crash when using Qt::WA_DeleteOnClose on a QPrintDialog on Mac.
Fixed performance regression in curve stroking.
Don't disable texture_from_pixmap on GLX/X11 by default.
Avoid creating copy of an image in memory when storing as png
Doc update for the support of MSVC 2010 64-bit
fix documentation of drawText(int, int, int, int, ...
...
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When reading from the resized image, we have to use the actual width
of the image, since we're reading the bits directly. This used to work
because the width never changed.
Reviewed-by: Gunnar
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Work around OpenGL driver reading arrays asyncronously
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Some drivers, e.g. the Nvidia driver on Windows, will sometimes read
the coordinate arrays asyncronously, which causes a crash if they are
allocated on the stack.
Reviewed-by: Kim
|
|\ \ \ \ \
| |/ / / /
| | | | |
| | | | |
| | | | | |
Conflicts:
src/gui/painting/qpdf.cpp
|
| |\ \ \ \
| | |/ / /
| |/| | /
| | | |/
| | |/| |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Explicitly check if the pbuffer context is multi-sampled and turn
off the render_texture extension if it is.
Task-number: QTBUG-14027
Reviewed-by: Kim
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We made a mistake of trying to make use of the texture_from_pixmap
extension by default when binding textures in Qt. The extension
have several limitation and using it produces crashes with certain
drivers/graphic card combos, but we can't change this now since
it will break existing apps using well behaved drivers.
We'll fix this for 4.8 with either a QGL::BindOption or configure
flag.
Revert "Don't try to use the texture_from_pixmap extension in
GL on desktop/X11."
This reverts commit 07c5429d5aacab932cd912e66287d66fb952e7c4.
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-12865
Reviewed-by: Samuel
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-13926
Reviewed-by: Gunnar
|
| |\ \ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/snippets/code/doc_src_qmake-manual.qdoc
src/corelib/arch/symbian/arch.pri
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
tests/auto/qfontmetrics/tst_qfontmetrics.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-14050
Reviewed-by: Eskil Abrahamsen Blomfeldt
|
| | |\ \
| | | |/ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Cache the last set filtering mode on glyph textures and update only
when necessary.
Reviewed-by: Gunnar Sletta
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Qt always uses the same texture unit as the maskTexture, so it makes sense
to set the uniform only once when the program is created.
Reviewed-By: Gunnar Sletta
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Gunnar Sletta
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The only consumer of TextDrawingMode is drawCachedGlyphs, and it always
sets these two attrib pointers anyway.
Reviewed-By: Gunnar Sletta
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If the glyph cache texture changes size, the texture coordinate array
must be regenerated to point to the correct texture locations.
Reviewed-By: Gunnar Sletta
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When used from outside of Qt, the OpenGL texture glyph cache would fall
back to using an image backend. This was not exactly ideal, so instead
it's rewritten to set up its own blit program etc. when the paint engine
is not available. Note that fillInPendingGlyphs() will potentially
alter the current GL state/viewport/bindings/etc., so it should be
called before setting up the actual painting.
Reviewed-by: Kim
|
| |\ \ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/gui/painting/qrasterizer.cpp
src/network/access/qnetworkaccessmanager.cpp
tests/auto/qpainter/tst_qpainter.cpp
tools/assistant/tools/assistant/mainwindow.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
There are far too many problems with this extension for it to be usable
on desktop at the moment, so disable on desktop GL for now. It's still
enabled for EGL, where it seems to have better driver support.
Task-number: related to QTBUG-11158
Reviewed-by: Samuel
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Avoid adding a virtual QPixmapData::hasMask() function, we can
do without it. Made QPixmap::hasAlpha() fast, so we can use that
instead.
Reviewed-by: Samuel
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Kim
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
A regression from 4.6.x. This is an X11-only problem caused by the
separate masks that an X11 QPixmap can contain. These masks we're not
taken into account when a number optimizations were done for 4.7.
Introduction of the texture-from-pixmap extension in 4.6 also broke
masked pixmaps under X11.
Task-number: QTBUG-13814
Reviewed-by: Samuel
|
| | |\ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix warning on MSVC
QThread: make sure start works even if called after exit
Revert "Fixed painter path drawing on FBO without stencil buffer."
Fix a crash with D&d on mingw
Revert "Keep other text format with QTextOption::SuppressColors tag on"
Fixed stencil buffer on FBOs with OpenGL ES.
Keep other text format with QTextOption::SuppressColors tag on
QTreeView: do not scroll to top if last item is removed
|
| | | |
| | | |
| | | |
| | | |
| | | | |
This reverts commit 89cbb165600de9a557a8a621dc41b93c2a7a2b52.
The patch should be applied to Qt 4.8, not 4.7.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If combined depth-stencil buffer is not supported, create
separate depth and stencil buffers.
Task-number: QTBUG-12861
Reviewed-by: Trond
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | | |
Conflicts:
configure
src/corelib/global/qglobal.h
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Since the logic of QTextureGlyphCache has been changed, it is impossible
to do an automatic merge of eb2926a2f9607e985b8bca54346e6fdf91343247.
This change fixes problems that occurred with that change:
1. We need to postpone actually resizing the texture until
fillInPendingGlyphs() where we are sure to have a context.
2. We have to fall back to a default max texture size when there is no
context.
Reviewed-by: Trond
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/gui/painting/qtextureglyphcache_p.h
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
|
| | |\ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
apply msvc flags to wince too
fix qt static build on wince
fix build with QT_NO_GESTURES
qmake: fix quoting of moc calls
Use regparm(3) for ICC too, otherwise it's an ABI mismatch in QChar
Regenerate the Unicode tables after updates to the generator tool
Compile in C++0x mode
remove extra includes
minor clean-ups
minor improvements for data parsers
tiny clean-up for generated data
move QUnicodeTables:: script() and lineBreakClass() implementations
make lupdate test less fragile
Enable building Qt/Webkit with debug symbols
Add breakpad support
|
| | | | |
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (105 commits)
Fixed drawing a large number of glyphs with the same font under GL.
Bump version to 4.7.1.
Qt headers must be included before X11 headers
Fixes bezier curves not being drawn when it is a line.
Avoid creating copy of an image in memory when storing as jpeg
QSslSocketPrivate::systemCaCertificates() hangs sometimes on Symbian
Add exception barrier to QCertificateRetriever::RunL()
Reference correct declarative elements page.
QtWebKit: Update tag files to match the same content on qtwebkit.git
QtWebKit: Downstream patch 2 fixing a crash on MSVC 64bit.
QtWebKit: Downstream patch 1 fixing a crash on MSVC 64bit.
Doc: updating the qdocconf files and the stylesheet
Doc: updating details on Tier 2 platforms
Doc: adding remark on release of qt quick element support in creator
Update configure.exe
Revert "let WebKit inject itself into the qt configuration"
Revert "fix qt_webkit_version.pri install for in-Qt builds"
Revert "Fixed incorrect Symbian scoping."
QS60Style: Itemviews are drawn incorrectly
Change to commercial license headers in preparation for release.
...
|
| | | |/
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Our glyph caching system doesn't take GL texture size limitation into
account, and assumes you can create an infinitely large texture.
On top of that, the cache will never create a cache that is wider
than 256, or QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH, which means we'll
hit the texture size limit even faster. With this patch the entire
texture is utilized. However, to fix in properly we need to support
having multiple texture for each font engine. That will be fixed
shortly (see task QTBUG-13784).
Task-number: QT-3971
Reviewed-by: Eskil
|
| | |\ \
| | | |/
| | |/| |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We need to clear the context from the cache when it's destroyed even if
it doesn't belong to a widget.
Task-number: QTBUG-13622
Reviewed-by: Trond
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/corelib/kernel/qobject.h
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
src/declarative/util/qdeclarativelistmodel.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-13450
Reviewed-by: Samuel
|