| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
symbian-socket-engine
Conflicts:
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtNetworku.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtGuiu.def
src/s60installs/eabi/QtNetworku.def
src/s60installs/eabi/QtOpenVGu.def
tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
|
| |
| |
| |
| |
| |
| | |
And also in QMetaMethod::invoke
Reviewed-by: brad
|
| |
| |
| |
| |
| | |
Code was removed in that commit 834ad29849ebef99d7e5c516cde26d550abff7cd
But the merge d54b3f04fa629fe031f1083073eef0145f0d6b1e reintroduced it back
|
| |
| |
| |
| |
| | |
It was somehow lost in the merge of the native symbian threads
(wrong merge was cf94df01d2d2364653f2ab602688394450e92d31)
|
| |
| |
| |
| | |
That call was removed in 0ee221b374ffef3657247be4c78e05689e04bef7
|
| |
| |
| |
| |
| |
| |
| |
| | |
improve error reporting by introducing a new enum value in case the
peer certificate is blacklisted.
Reviewed-by: Markus Goetz
Task-number: QTBUG-18338
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
PreferNetwork means: send out a request and read from cache if it has
not been modified.
PreferCache means: load resource from cache if it has not expired yet.
This commit makes the cache behave according to the documentation.
Reviewed-by: Markus Goetz
|
| |
| |
| |
| | |
Reviewed-by: Trust me
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
src/corelib/thread/qthread_unix.cpp
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Fixed compilation of qpixmap_raster.cpp
Draw graphics item bounding rects drawn when QT_DRAW_SCENE_ITEM_RECTS=1
Put all the declarations of qt_defaultDpi{,X,Y}() in one place
Really avoid compiler warnings on Windows
Made extension resolving work with Core profile.
Avoid some compiler warnings on Windows
Fix positioning in GL2 paint engine with subpixel antialiasing
Update defs files
Doc: Updating 3rdparty license doc
Update .def files
Another compilation fix for WinCE
Updating libjpeg: Add Qt building modifications
Updating libjpeg: Add version 8c.
Updating libjpeg: Removing libjpeg version 8
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
qfont_p.h indirectly includes qdebug.h, which must be included before
any X11 headers (as they define Status).
Reviewed-by: Jiang Jiang
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
It is extremely handy to visualize bounding rects when developing pixel
perfect graphics view based applications. This change makes it possible
to define an environment variable (inspired by QT_FLUSH_PAINT) to enable
drawing of graphics items' bounding rects with random colors. Any
graphics view/declarative example can be used to test the feature.
Merge-request: 981
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Samuel Rødal
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The Core profile was introduced in OpenGL 3.2 and if chosen removes
all deprecated functionality from the OpenGL API.
In the Core profile glGetString(GL_EXTENSIONS) is unsupported, so
instead we need to use glGetStringi(GL_EXTENSIONS, index) together with
glGetIntegerv(GL_NUM_EXTENSIONS). Also optimized the QGLExtensionMatcher
to not have to recompute the split positions all the time.
Preliminary support to prevent non-core-functions to be called in the GL
2 engine has also been added.
Reviewed-by: Kim
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
In this case we will use QTextureGlyphCache with FreeType renderer,
which requires the subpixel positition to get correct left bearings,
thus alphaMapBoundingBox is extended to support subPixelPosition.
In QFontEngineFT we also simplify the code a bit by reusing
loadGlyphs for metrics calculation instead of duplicate code. Since
we need to use the glyphs after all, cache them here in
alphaMapBoundingBox shouldn't be a problem.
Reviewed-by: Eskil
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: TRUSTME
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/s60installs/bwins/QtOpenVGu.def
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: TRUSTME
|
| | | |\ \ |
|
| | | | | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This is a clean copy of the official distribution of libjpeg version 8c,
except that various extraneous stuff (examples, tests, etc.) have been
removed, as usual. Modifications to build it in Qt will follow in a
separate commit.
|
| | | | | | |
|
| | | | | | |
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: (42 commits)
Fixed QFtp autotests not to crash in network time out situations
Make createpackage and patch_capabilties scripts use tmp dir
Fix for QTBUG-16985.
Revert "QComboBox fix for QTBUG-16985"
Moving Symbian CPU core detection to qthread_symbian.cpp
QComboBox fix for QTBUG-16985
Making Symbian helper threads exit cleanly at app exit
Add ".make.cache" to the files to be cleaned for symbian-abld.
Fix mismatched $$translations handling after merge
Fix emulator deployment for items with "!:" drive.
Fix build break
Add digit conversion in default format function
Removed broken "deploy.path" support from Symbian
fixing build issue in qwaitcondition_symbian.cpp
fixing build error in qthread_symbian.cpp
Strip echo suppression character "@" from commands in symbian-sbsv2
key to string translations for Symbian return and tab characters
Copying change to unix and Windows QThread implementation to Symbian
Using Symbian native mutex type in tst_bench_qmutex
removing unused headers
...
|
| | | |\ \ \ \ |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
QComboBox popup is resized/positioned correctly when device orientation changes.
Task-number: QTBUG-16985
Reviewed-by: Sami Merila
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The commit has to be reverted due to introduced build break for non-Symbian platforms.
This reverts commit 89660713717dcbd6126d6a38f911b7a90dff7ba7.
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This is resolving a merge issue where Symbian CPU core detection was
added in one branch, but all the Symbian thread support was moved to
a new file in another branch.
Reviewed-by: Shane Kearns
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The idle detector thread and the adopted thread monitor thread could
keep an app alive unnecessarily after main had exited, if the app's
main thread was no longer set "process permanent".
The idle detector thread now exits when the QCoreApplication is
destroyed.
The adopted thread monitor thread now exits when there are no more
adopted threads to monitor.
Task-number: QTBUG-18073
Reviewed-by: Shane Kearns
|
| | | |\ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Task-number:
Reviewed-by: laszlo agocs
|
| | | |\ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Conflicts:
src/corelib/thread/qthread_unix.cpp
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Task-number: QTBUG-17993
Reviewed-by: Laszlo Agocs
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
include of qelapsedtimer was missing a .h
Reviewed-by: Robert DeWolf
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
CI found that an include of qsystemerror_p.h was incorrect
Reviewed-by: iain
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
The Symbian port was not supplying string content for special characters
that have a valid string representation. These appear to be return and
tab characters. Now it does, for these.
Task-number: QTBUG-17545
Reviewed-by: Shane Kearns
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
During merge of SymbianLite branch, it was found that windows and unix
QThread implementations had an identical change to locking on thread
start. This change is now also applied to Symbian.
Reviewed-by: iain
|
| | | |\ \ \ \ \ \ \ |
|
| | | | |\ \ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / /
| | | |/| | | | | | | | |
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
qdebug.h was only temporarily needed for debugging.
errno.h is not needed for Symbian code.
Task-number: QTBUG-13990
Reviewed-by: Shane Kearns
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Benchmarks showed no benefit from RFastLock vs RSemaphore. Since
RSemaphore works on all target platforms, and RFastLock does not, there
is no benefit in using RFastLock. So to simplify the code, it is
removed.
Task-number: QTBUG-13990
Reviewed-by: Shane Kearns
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
It needed an initial lock to make it behave like a semaphore.
Task-number: QTBUG-13990
Reviewed-by: Shane Kearns
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Removed a call to get the symbian thread handle when we already had it.
Improved error reporting on failure.
Task-number: QTBUG-13990
Reviewed-by: Shane Kearns
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
The adopted thread monitor could cause a stray event panic if multiple
threads where added quickly. A new autotest was written to force the
fault (successfully). A fix was then added.
Task-number: QTBUG-13990
Reviewed-by: Shane Kearns
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
From review comments on QThread_Symbian.cpp.
init_symbian_thread_handle now opens the thread with process wide
ownership directly, rather than going through an intermediate
Duplicate.
Retested QTBUG-13612 test case, which originally caused that function
to be written. tst_qthread passes.
Task-number: QTBUG-13990
Reviewed-by: Shane Kearns
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Improved documentation
Added a trywait(0) test and fixed the bug it found
Symbian implementation throws on construction fail
Task-number: QTBUG-13990
Reviewed-by: Shane Kearns
|