| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Consolidate zlib configuration redundancy
Fixed whitespace formatting
Fix incomplete support for built-in jpeg, mng, tiff and gif handlers
Split image handler plugin project files
No explicit link to zlib/jpeg for system mng/tiff
Removed stray line continuations
Long live else!
qdoc: Added a solution for creating tables of contents for manuals.
Doc: Fixed markup.
Fixed size hint for combo box on windows
|
| |
| |
| |
| |
| | |
Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Previously, although the configure shell script could configure
built-in support for these image formats, the .pr[io] files
would nevertheless build them as plugins. Support was also
missing from qimagereader and qimagewriter. This has now been
added.
Configure.exe, while clearly intended to support this too,
needed a few minor fixes. For example, the usage of values
"qt" and "yes" was inconsistent.
For both configure tools, the explanation of the *non*-related
options has been clarified, i.e:
-no-libjpeg
-qt-libjpeg
-system-libjpeg
These options have nothing to do with the plugin/built-in
distinction.
There are (still) no configure options for specifying "plugin" or
"built-in" for these image formats. Quite reasonably, "plugin"
is selected for shared Qt and "built-in" is selected for static Qt.
Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
One pri for each handler, e.g. src/gui/image/qjpeghandler.pri.
One pri for each 3rd party package, e.g src/3rdparty/libjpeg.pri.
One shared pri for zlib dependency of 3rd party packages.
This was really about image handler plugins, but PNG got the
same treatment for consistency's sake.
Also, moved image handler source files from plugins to src/gui/image
so they are with the other image handlers.
Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
For "system" mng or tiff, the shared library mechanism takes care
of loading zlib. For exotic cases like static system mng/tiff/zlib,
one should use configure's -l option. Trying to cover such cases
in project files leads to clutter which is at best harmless for other
cases.
Png already had this arrangement.
The same principle applies to jpeg which is a potential dependency
of tiff and mng. However, bundled tiff and mng are built without
jpeg. Shared system jpeg is loaded automatically if needed. Static
system jpeg can be handled with configure's -l option.
Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
tools/qdoc3/test/qt-html-templates.qdocconf
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When you use larger fonts or DPI on windows, the combobox can
calculate a size hint that results of text eliding on items.
This fix removes some duplicate code in Vista style and adds
a dpi dependant size hint for XP style.
Task-number: QTBUG-7552
Reviewed-by: richard
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Crash when dragging with mingw
Don't do alpha/opaque check which might cause a conversion and later pointer not-matching.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The problem was that there was a misalignment coming from the d&d code.
That called in the end our SSE optimized functions.
This code turns out to be calling QApplication::processEvents which
in the the calls the Qt event dispatcher for windows' processEvents
function. This function will now also always align the stack to 16
bytes and be SSE ready.
Task-number: QTBUG-11880
Reviewed-by: Zeno Albisser
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
not-matching.
Merge-request: 724
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|\ \ \ \
| |/ / /
|/| | /
| | |/
| |/|
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
qdoc: Fixed spacing before "default" and "read-only".
Designer: Fix compiler warnings.
Fix compiler warning.
Abort if connection to DBus cannot be established.
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Warnings introduced by 312c028d44a80f5d6029eb166a0de731f8452525
and gcc 4.5.
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
|
| |/ /
| | |
| | |
| | | |
Task-number: QTBUG-11346
|
| | | |
|
|/ /
| |
| |
| |
| |
| |
| | |
Fixes network access issue when running Qt applications in scratchbox
environment.
Task-number: QT-3528
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Doc: Adding navigation and style fixes. Also rearranging qml elements
|
| | | |
|
|\ \ \
| |/ /
|/| |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
Updated WebKit to cd3aee284bddf4ff9d26f3bcaa7c33d478e81e10
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Integrated changes:
|| <https://webkit.org/b/41451> || [Qt] Crash when destroying a QWebView with a QComboBox as its child. ||
|| <https://webkit.org/b/41157> || Spatial Navigation: refactor spatial-navigation-utils.js to support testing nested frames deeper than one level ||
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QSslSocket::systemCaCertificates(): have one common case for all Unices
Fixed QX11EmbedContainer.
Improved a bit detection of a touch screen on Windows.
qdoc: Fixed invalid format in the html header.
link glu32 before opengl32
Stopped trying to output QML property list in 2 columns
|
| | |
| | |
| | |
| | | |
Reviewed-by: Simon Hausmann
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Enforce the creation of the native window id for the focusproxy widget inside
the container to make sure we won't get a CreateNotify event to try to embed
the focusproxy itself.
Task-number: QTBUG-10809
Reviewed-by: Bradley T. Hughes
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Use the bitfield description from MSDN instead of just checking if there is any
kind of digitizer.
Reviewed-by: Prasanth
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
otherwise the build fails if the libraries are statically built, as glu
depends on opengl.
Task-number: QTBUG-11863
|
| |/ /
| | |
| | |
| | | |
Task-number: QTBUG-11803
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-11009, QTBUG-11096
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (51 commits)
Symbian on Linux: $QTDIR/bin is not necessarily in the path.
Updated Symbian def files with new EGL exports.
Added another missing EGL stub.
Fixed compilation on Symbian.
Added missing EGL stub function.
Got rid of unused variable compiler warning.
QGLWindowSurface support for partial updates via EGL_NOK_swap_region2
Adding func prototypes for EGL_NOK_swap_region2 extension.
Check for EGLSurface leak only when paint device is a QGLWidget.
Fixed bug in drawTiledPixmap when width of pixmap matches target rect.
Update def files for symbian
Improved performance of 16 bit memrotates using NEON instructions.
Use built-in iconv on Solaris if available
Export various symbols needed to make a custom GL graphicssystem.
Moc: fix compilation when templated types with multiple arguments are used.
Fixes the documentation of QGraphicsEffect::update().
support BGRA textures on SGX
Avoid calling time.elapsed() twice in abstract animation
Adds slowdownFactor to UnifiedTimer in abstract animation
Add the conversion in-place for QPixmap::fromImageReader() on raster.
...
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
So it would not find elf2e32_qtwrapper
use the qtPrepareTool macro that does the right thing.
But this macro need QT_BUILD_TREE to be defined, which is not defined
yet early in the test process. So change the tests accordingly
Reviewed-by: ossi
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Shane Kearns
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Shane Kearns
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Use EGLint, not GLint here, as GLint might not be defined.
Reviewed-by: Shane Kearns
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Shane Kearns
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
(if extension available).
Merge-request: 712
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge-request: 712
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
(not QGLWindowSurface for example).
Merge-request: 722
Reviewed-by: Trond
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
qt_memconvert's duff's device implementation assumes that count is > 0,
if count is 0 it will still blit eight pixels.
Reviewed-by: Trond
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Make the memrotate functions a function pointer table so that we can
replace it with optimized versions, and implement an optimized NEON
version for the 90 and 270 rotations.
Measured performance improvement for a 400x400 16-bit pixmap was
17 % for 270 degree rotation and 11 % for 90 degree rotation.
Reviewed-by: Trond
|
| |\ \ \ \
| | |_|/ /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (39 commits)
Use built-in iconv on Solaris if available
Export various symbols needed to make a custom GL graphicssystem.
Moc: fix compilation when templated types with multiple arguments are used.
Fixes the documentation of QGraphicsEffect::update().
support BGRA textures on SGX
Avoid calling time.elapsed() twice in abstract animation
Adds slowdownFactor to UnifiedTimer in abstract animation
Add the conversion in-place for QPixmap::fromImageReader() on raster.
Add QPixmap::fromImageReader() to decode arbitrary images in place.
Add missing license header.
Added textureUpload benchmark to the GL benchmarks
Fixed a crash in menubar with invisible actions
Fixed ARM .def files.
Doc: QSettings::sync() imports changes made by other processes.
Made -graphicssystem trace work with Qt::TextBypassShaping flag.
Fix an assertion in comp_func_SourceOver_sse2() if const_alpha == 0
Add a manual test for regular widget interaction with the table.
New variant of ::createPixmapData with origin for QGraphicsSystem.
EGL plane levels are the same as all other GL backends.
Need to access extensionFuncs in subclasses too.
...
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (39 commits)
Use built-in iconv on Solaris if available
Export various symbols needed to make a custom GL graphicssystem.
Moc: fix compilation when templated types with multiple arguments are used.
Fixes the documentation of QGraphicsEffect::update().
support BGRA textures on SGX
Avoid calling time.elapsed() twice in abstract animation
Adds slowdownFactor to UnifiedTimer in abstract animation
Add the conversion in-place for QPixmap::fromImageReader() on raster.
Add QPixmap::fromImageReader() to decode arbitrary images in place.
Add missing license header.
Added textureUpload benchmark to the GL benchmarks
Fixed a crash in menubar with invisible actions
Fixed ARM .def files.
Doc: QSettings::sync() imports changes made by other processes.
Made -graphicssystem trace work with Qt::TextBypassShaping flag.
Fix an assertion in comp_func_SourceOver_sse2() if const_alpha == 0
Add a manual test for regular widget interaction with the table.
New variant of ::createPixmapData with origin for QGraphicsSystem.
EGL plane levels are the same as all other GL backends.
Need to access extensionFuncs in subclasses too.
...
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-1853
Reviewed-by: Thiago
|