| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|\
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |
| |
| |
| |
| |
| |
| | |
It is often convenient to always return the full set of data, even if
only some roles are requested.
Reviewed-by: Martin Jones
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
|/ |
|
| |
|
|\
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |
|
| | |
|
| |\
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | |
|
| | |\
| | | |
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | | |
|
| | | | |
|
| |/ /
| | |
| | |
| | | |
The canvas framerate monitor now uses this support.
|
| | | |
|
|\ \ \
| | |/
| |/|
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |
| | |
| | |
| | | |
Only print AST if QML_COMPILER_DUMP is set
|
| |\ \
| | |/
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |
| | |
| | |
| | |
| | |
| | | |
Change QMAKE_INCDIR_OPENGL and QMAKE_LIBDIR_OPENGL to
QMAKE_INCDIR_OPENGL_QT and QMAKE_LIBDIR_OPENGL_QT so qmake will pick
them up.
|
| |/
|/| |
|
|\ \
| |/
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |
|
|\ \
| |/
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |
|
| |\
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | |
|
|\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
kinetic-declarativeui
Conflicts:
src/corelib/kernel/kernel.pri
src/corelib/tools/tools.pri
tools/qdoc3/htmlgenerator.cpp
tools/qdoc3/htmlgenerator.h
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
I tested it with 32 bits compilation and there is no warning any more.
Task-number: 247325
Reviewed-by: ogoffart
|
| | | |
| | | |
| | | |
| | | | |
The typo was in commit 30f7edc0aab629499b74263391ae529ad31b2ff8.
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Samuel
|
| | | | |
|
| | |\ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
I made this change to make things look a bit better on the mac. However,
a toolbutton with text only looks strange and as a bonus the arrow
covers some of the text, which no one wants. It seems that similar
consructions in Cocoa don't show the arrow for text button, so we
shouldn't either.
Task-number: 253339
Reviewed-by: Jens Bache-Wiig
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
header + file. Now test check only size of the real file content,
assuming that it is rather boring (9,5MB of '\0'). It simply skip
header.
Reviewed by Peter Hartmann
|
| |\ \ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Peter Hartmann
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Thierry
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
useless.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: ogoffart
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-By: Kavindra Palaraja <kavindra.palaraja@nokia.com>
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
That way we prevent the current possible race condition that may appears
while touching signals slot while object are moved to different threads.
For exemple, when we do sender->threadData->mutex->lock(); the sender
can possibly be moved to another thread between the moment we get the
pointer to the threadData and the moment we aquire the lock. We could
check if we locked the right mutex and retry otherwise, but that would
break if the threadData (and hence the mutex) get destroyed in between.
The per object mutex is implemented with a thread pool.
I'm not using the global QThreadPool because we might ends up locking
two of their mutex, and that would be dangerous if something else holds
a lock on the same mutex (possible deadlock)
Putting the mutex pool in a Q_GLOBAL_STATIC doesn't work as it might
result of the ppol being deleted before some other object in others
Q_GLOBAL_STATIC structures
There is no need to lock this mutex in moveToThread as this is safe.
When emiting a signal, we do not need to lock the thread data, as the
user must ensure that the object is not moved to a thread while emiting
a AutoConnection signal.
Reviewed-by: Brad
|
| |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
At some point, we may revise this to use plain C strings at first, then
introduce the concept of translations.
Reviewed-by: Trust Me
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Trust Me
|