| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
| |
Similar work was done in Qt5 in Change Id3b02316
Change-Id: I392d2a5bfffb9a335f28d5dbc5ea27b800fc4487
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Fixes regression introduced by
aa21fcac3672cc6f0dca064b34bbe02ca4f4def7
Change-Id: Iada496dd8fee390771d8fc12066e93ef086dee90
Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com>
Reviewed-by: Juhani Taipale <juhani.taipale@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Backport of commits:
fb62fdac1cdb4e26388b5bacc7422ec4579b217e
fe7c600fabdfb1b4cbad624ce7cb736e5edce86d
3ef51efbe75bfb9f1dfbe7df073e9eb745a72ad8
47fd7128dba4c38ff1bfcc517fec0f063fb90e4c
Change-Id: Ibcb13ebb2e6cb05ab381328228eca5abdde52ad9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This ensures interoperability between the Blackbery C and C++ APIs
and makes it easier to expose platform services in C++ that are
exposed in BPS - since events from both APIs can be processed on
the same thread.
Backport of qtbase 0723e14699704c35d5d61fa7f5e9f3bdbb378afa
Change-Id: Ie0d66e7f9b9984ad3acff61f01665a2b90ef40db
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
| |
otherwise drawn intensive apps will hog the cpu
and make the system appear frozen
Merge-request: 1259
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
|
|
|
|
|
|
| |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|
|
|
|
| |
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)
|
|\
| |
| |
| |
| | |
Conflicts:
src/corelib/thread/qthread_unix.cpp
|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
src/corelib/thread/qthread_unix.cpp
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QThread, QWaitCondition and QMutex have new Symbian native
implementations. These new implementations are split out into
new _symbian files.
Task-number: QTBUG-13990
Reviewed-by: Shane Kearns
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QThreadData::current is too slow, it needs to access the TLS
The currentThreadId is much faster.
Reviewed-by: Brad
|
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
if there is a QEventDispatcher in QAdoptedThread.
QAdoptedThread is supposed to be destroyed when the QThreadData is
destroyed. But QThreadData is ref-counted, and QEventDispatcher holds
a reference to it. QEventDispatcher is supposed to be destroyed
in QThreadPrivate::finish, which is supposed to be called from the
destructor of QAdoptedThread.
There is a circular dependence. We break it by calling finish in the
callback that is called when the thread is finished.
Task-number: QTBUG-17986
Reviewed-by: Brad
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
|
| | |
| | |
| | |
| | |
| | | |
Reviewed-by: Jani Hautakangas
Reviewed-by: Shane Kearns
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-2199
Reviewed-by: Shane Kearns
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
As also mentioned in QTBUG-16692
Reviewed-by: brad
Task-number: QTBUG-17257
|
| |/
|/|
| |
| |
| |
| |
| | |
It slightly faster, and QThreadData::current is used everywhere
Reviewed-by: mread
Reviewed-by: Joao
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/webkit/imageanalyzer/imageanalyzer.h
examples/webkit/imageanalyzer/mainwindow.h
mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h
src/corelib/io/qfsfileengine_iterator_unix.cpp
src/corelib/io/qfsfileengine_iterator_win.cpp
src/corelib/kernel/qcoreapplication.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/plugins/bearer/connman/qconnmanservice_linux.cpp
src/plugins/platforms/openvglite/qwindowsurface_vglite.h
src/s60installs/bwins/QtCoreu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/s60installs.pro
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qdoc3/test/qt-html-templates.qdocconf
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qmake/generators/symbian/symmake.cpp
src/corelib/global/qglobal.h
src/gui/kernel/qwidget_p.h
src/gui/painting/qtextureglyphcache.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
src/plugins/qpluginbase.pri
src/qbase.pri
tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
tests/auto/qthread/tst_qthread.cpp
tests/auto/selftests/expected_cmptest.txt
tests/auto/selftests/expected_crashes_3.txt
tests/auto/selftests/expected_longstring.txt
tests/auto/selftests/expected_maxwarnings.txt
tests/auto/selftests/expected_skip.txt
tools/assistant/tools/assistant/doc/assistant.qdocconf
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qdeclarative.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf
tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
tools/qdoc3/test/qt.qdocconf
tools/qdoc3/test/qt_ja_JP.qdocconf
tools/qdoc3/test/qt_zh_CN.qdocconf
|
| |
| |
| |
| |
| |
| | |
Fail to compile since f3405a516ac30fc7dee1
Reviewed-by: Joao
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
finished()
Since we do not keep the mutex locked in QThreadPrivate::finish,
We could have races if the thread is destroyed or restarted from
another thread while we are still in that function
This solve tst_QCoreApplication::deliverInDefinedOrder on mac
Regression since a43583e0221311b7fe666726a
Reviewed-by: Brad
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
optimize ligatureHelper by using qBinaryFind instead of the for loop
QFileSystemWatcher: Do not require QApplication in the destructor.
Do not define METHOD if QT_NO_KEYWORD is defined.
QThreadPrivate::finish should not keep mutex locked when calling signals
Make QThreadStorage supports value type and not only pointers.
QThreadStorage: fix memory leak if thread storage are added while destroying
Compile fix.
Fix some warnings on Mac
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This fix the deadlock shown in the new test wait3_slowDestructor
Add a test for QThread::wait(timeout)
Task-number: QTBUG-15030
Reviewed-by: Joao
Reviewed-by: Brad
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This reverts commit 8c31c6529935cd9ee6f99bc38cfd182d5b3182e2 due to a
regression in the QThreadStorage autotest.
Fix the problem another way: call pthread_once() in the destructor function
to ensure that we always call pthread_key_delete() on a key we created.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Remove the Q_UNUSED(), which uses template magic for some compilers, but some
compilers don't accept local types as the template argument.
Reviewed-by: trustme
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The destructor function destroy_current_thread_data_key() was always
called on library unload, even if the pthread_key_t was not initialized.
This can cause us to destroy a key that doesn't belong to us, as pointed
out in the task below.
Fix this by creating a function static instance of a class whose
destructor will destroy the key.
Task-number: QTBUG-10861
Reviewed-by: Morten Sørvig
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Add autotest for QScriptExtensionPlugin
Improve QtScript test coverage
Don't crash when null-pointer is passed to qScriptValueFromValue()
Simplify object lifetime management when moving objects to a QThread
samegame: white space
Move list of trusted benchmarks out of QA dungeon and into Qt
Don't put Objective-C sources in SOURCES
mkspecs: Emit warning when including g++.conf directly
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The documentation for Qt::AutoConnection states is a signal is emitted
from the same thread as the receiving object, the connection should
behave as Qt::DirectConnection. The actual behavior prior to this commit
was different from the documentation; if the signal was emitted in a
thread different from the sender's thread, then we would queue (which is
now corrected). By making the behavior match the documentation, it is
now possible to connect QThread's finished() signal to an object's
deleteLater() slot and the slot will execute when finished() is emitted
(previously it was queued).
QObject::deleteLater() uses a posted QEvent::DeferredDelete event to
trigger deletion of the object. In QThread, after emitting the
finished() signal, we now send all pending DeferredDelete events to
ensure that all pending deletions happen. We have precedence for this
behavior, QCoreApplication::exec() does the same thing after emitting
the aboutToQuit() signal.
Reviewed-by: joao
Reviewed-by: olivier
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/opengl/qwindowsurface_gl.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
TLS access on Symbian is significantly faster than using
pthread_getspecific. In the case of QThreadData, the data associated
with a thread, it makes sense to store and access the pointer in TLS
rather than using the pthread thread specific functions.
However, the pthread thread specific function have some destructor
functionality that Symbian TLS does not, so Symbian still uses the
pthread functions for setting the QThreadData to get the destruction
behaviour.
This change has wide ranging performance benefits for QML execution.
With improvements shown on a number of the declarative benchmarks.
Frame drawing times on test apps are also showing some improvement.
The qthread* autotests have been run on Symbian^3 and Ubuntu 10.10
Task-number: QT-4089
Reviewed-by: Shane Kearns
|
|\ \ |
|
| | |
| | |
| | |
| | | |
Reviewed-by: Jørgen
|
| |\ \
| | |/
| | |
| | |
| | | |
Conflicts:
src/gui/painting/qpdf.cpp
|
|\ \ \
| | |/
| |/|
| | |
| | | |
Conflicts:
src/gui/painting/qpdf.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Regression in 4.7.0 introduced by 13ca61fcfdc53a6a06a
Reviewed-by: brad
Task-number: QTBUG-13810
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | | |
Conflicts:
configure
src/corelib/global/qglobal.h
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Symbian kernel will kill all threads except the main one before running
destructors on global static objects. Qt gets no notification of these
thread terminations, so it'll still think those threads are running
and will wait indefinitely for their exit. QThread::wait() now checks if
the thread is actually still alive before starting to wait on
thread_done wait condition.
Task-number: QTBUG-13612
Reviewed-by: Janne Koskinen
|
| |/
|/| |
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
src/gui/image/image.pri
src/gui/image/qpixmapdatafactory.cpp
src/gui/painting/qgraphicssystem.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
On Symbian OS, a thread is non critical by default - this means if it
crashes the process does not automatically terminate, rather it is
allowed to handle the crash by itself. Only the main thread is critical
by default.
Since this is not the behaviour on other platforms, application developers
are unlikely to have considered this case - and would need to write
symbian specific code to catch the crash.
For such advanced users, they can reset the critical flag on the thread
once they get control in QThread::run().
By default, a crash in any thread created via the QThread API will now
crash the process.
Reviewed-by: Iain
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
| |
This commits adds build system to support for the native
client compiler (x86-only for now), sets up global defines,
and adds compile fixes for QtCore and QtGui.
Details:
* Add mkspecs for linux-nacl-g++ and macx-nacl-c++
* Add nacl configure option
* Add qconfig-minimal-system-dependencies.h
* Define Q_OS_NACL in qglobal.h
* Add qnacalunimplemented.h/cpp with POSIX stubs.
* .pro file changes for cross-compiling on Mac
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QThread will register a cleanup function with pthreads to be run when
ever a thread exits. However, if QtCore is unloaded, this function would
stay registered and the application would crash when a thread exits
(since the function pointer registered with pthreads is no longer
valid).
Add a destructor function to qthread_unix.cpp which destroys the
pthread_key_t and unregisters the cleanup function.
Task-number: QTBUG-9436
Reviewed-by: Marius Storm-Olsen
|
|
|
|
|
|
|
|
| |
I don't know of any other systems that define SCHED_IDLE, but if any
do, they'll use this code too
Task-number: related to QTBUG-9032
Reviewed-by: Bradley T. Hughes
|