| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Use the thread-default glib context for the DBus connection in the ICD bearer manager.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
bearer manager.
This allows the bearer management plugin to be ran on a thread
different than the main one.
Task-number: QTBUG-17199
Reviewed-by: Kranthi <kranthi.kumar-kuntala@nokia.com>
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
QScriptEngine: fix property flags for native functions
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fix the tests and implementation to conform with ECMA-262, property
"prototype" of the function and "constructor" of the prototype object
associated with the function.
Reviewed-by: Kent Hansen
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Cocoa: Mouse-grabbing in pop-up menus on OS X isn't working
Alien/Cocoa: popups in creator does not always work for press'n'hold
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The reason is that we special case handling of popups, but have
forgotten to check for mouse grabs. This patch checks the grabs,
also for popups
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Reason: Cocoa redirects mouse events to the view that received the
mouse press (until a corresponding release is preformed). This
confused qt_mac_getTargetForMouseEvent as it stood. This patch
is more careful about trusting the native widget / nsview
suggested by cocoa.
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Fix builds with compilers without --with-fpu=neon as a default.
Improve performance of partial updates in raster window surface on X11.
Fixed MIT-SHM errors in QNativeImage.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The changes introduced in fac68dca46131d63f11c37210834073848f5a93d do not work
correctly on compilers without --with-fpu=neon as a default, NEON_SOURCES would
be (incorrectly) compiled without -mfpu=neon, resulting in build failure.
This also moves -mfpu=neon after CXXFLAGS, as CXXFLAGS may contain
-mfpu=vfpv3-d16.
Issue noted by Carsten Munk while building Qt for MeeGo ARM with NEON.
Merge-request: 1042
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
An XSync is needed to prevent the raster engine from writing to the
shared memory raster backbuffer at the same time the X server reads from
it. However, instead of doing the sync right after telling X to blit, we
can do it right before we start writing to it with raster. At this point
there will on average be less processing heavy X commands in the command
queue, and we thus spend less time blocking the GUI thread.
Measured frame rate improvement of 20 - 60 % in an update stress testing
the performance of partial updates.
Idea-from: Olivier Goffart
Reviewed-by: Bjørn Erik Nilsen
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The POSIX standard doesn't allow attaching to IPC_RMID-flagged memory,
even if Linux allows it, thus we need to wait until after calling
XShmAttach and XSync before we set the flag. See the man page for shmctl().
Reviewed-by: Olivier Goffart
|
| |\ \ \ \ \
| | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix warning about deprecated conversions of string literals to char *
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Samuel Rødal
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Revert "Delay creation of the process manager"
|
| | | |_|/ /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This reverts commit daba2c507ad42c66dafa6a29cffa94e9641e0c58.
There's a potential deadlock when a QProcess is created while a
QCoreApplication is instantiated but never executed, or if the main
thread waits() for the child thread.
|
| |\ \ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QtDBus: add support for QVariantHash out of the box
|
| | |/ / / |
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (29 commits)
Fix for QTBUG-17035
Fix QMutex can deadlock when calling tryLock
Carefull free the data from XGetWindowProperty on X11.
Fixes memory leaks in QX11Embed
Fixed missing text when using static text items in GL 2 engine.
Prevent recursion when creating window surface.
Fixed es2 configure when both EGL/egl.h and GLES/egl.h are present.
document that QThread::exit will exit future event loops
Revert "Restore Qt 4.6 behaviour: exec() always enters the event loop."
Don't ignore source-text when generating qsTrId translations for QML
Fix a crash when undoing form layout
Fix generated mif file cleaning in symbian-abld
Fix potential networking crash due to null-pointer dereference
Fix typo in qglthreads auto test.
Revert "Improve timer ID safety by using a serial counter per ID."
Invalidate QScriptPrograms when engine is destroyed
Fix alignment issue causing crash in QtScript/JavaScriptCore
Orientation control implementation for Symbian
Restore Qt 4.6 behaviour: exec() always enters the event loop.
No longer replace dash and dot in TARGET with underscore in Symbian
...
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
|
| | | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix QMutex can deadlock when calling tryLock
Fixed missing text when using static text items in GL 2 engine.
Prevent recursion when creating window surface.
Fixed es2 configure when both EGL/egl.h and GLES/egl.h are present.
document that QThread::exit will exit future event loops
Revert "Restore Qt 4.6 behaviour: exec() always enters the event loop."
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
in the unix code, if the QMutexPrivate::wait() with a timeout
expires in the same moment that the mutex is released, wakeup
would be set, but would be then ignored. (reset to false
quickly after)
If we waken up between the timeout and the re-aquisition of
the internal mutex, we consider that the mutex has been locked.
Reviewed-by: brad
Task-number: QTBUG-16115
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
When the context is destroyed and recreated, we end up with a new glyph
cache, but we only recreate the vertex arrays for the very first static
text item. We need to keep track of the glyph cache in each text item,
so that we can recreate the vertex arrays and re-populate the cache
accordingly. As the pointer might be the same after the glyph cache is
recreated, we need to use serial numbers instead.
We also need to re-create the cache when the context pointer has been
invalidated, so that the static text items also get invalidated, and
the texture glyph cache gets repopulated.
Reviewed-by: Eskil Abrahamsen Blomfeldt
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
If we can't access the qt_gl_share_widget() we should just create a
raster window surface. This might happen when creating the share widget
itself leads to creation of a window surface (which isn't really going
to be used anyways).
Reviewed-by: Michael Dominic K
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Brad
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This reverts commit 2e72a8b19ea6c674fb4777860dac50faa5d387e6.
The behavour in Qt 4.6 was wrong. And even if it was not documented,
it is too late to change the behaviour back at this point.
The tests for QEventLoop and QCoreApplication have not been reverted
Reviewed-by: Brad
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Aaron McCarthy
Task-number: QTBUG-17035
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Make sure we free the data correctly in case of error.
Task-number: QTBUG-16616
Patch-by: Juuso Pakarinen
Reviewed-by: Ritt Konstantin
|
| | | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
We should XFree the values returned from XGetWindowProperty.
Task-number: QTBUG-16597
Reviewed-by: Ritt Konstantin
|
| | |\ \ \ \ \
| | | |_|/ /
| | |/| | | |
|
| | |\ \ \ \ \
| | | |/ / /
| | |/| / /
| | |_|/ /
| |/| | |
| | | | | |
Conflicts:
mkspecs/features/symbian/application_icon.prf
src/sql/drivers/odbc/qsql_odbc.cpp
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix potential networking crash due to null-pointer dereference
Revert "Improve timer ID safety by using a serial counter per ID."
Invalidate QScriptPrograms when engine is destroyed
Fix alignment issue causing crash in QtScript/JavaScriptCore
Restore Qt 4.6 behaviour: exec() always enters the event loop.
Make syncqt not complain about missing header macros.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
An internal bug report suggests that we unconditionally dereference the backend
pointer in QNetworkReplyImpl when checking for the synchronity of the
originating request. The dereferencing code was introduced in commit
ad1e82323225e996720136e8b2d669166b8d8441. Unfortunately the report does not
detail where/how the crash happened, but it appears plausible that the backend
pointer became null, and the surrounding code that has extra checks suggests
this, too. In an attempt of defensive programming this patch introduces
the missing check in the reported line 112 as well as in other places
where it seems appropriate.
Reviewed-by: Peter Hartmann
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This reverts commit 121e2b39043a4ffc6583f250aebb9a3a746076c1. It was
considered too dangerous for 4.7.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
If the engine is destroyed before the program, the program
must be invalidated; otherwise the program destructor will
access a stale engine pointer, which can cause a crash
(it crashes on Symbian, but "only" gives a Valgrind warning
on Linux for our autotests).
We need to keep track of all associated programs, just like
we already do for values and strings. This fix follows the
exact same pattern, but uses a QSet to keep the patch minimal.
No new tests, but the evaluateProgram() test runs successfully
on Symbian now, and there are no more Valgrind warnings.
Task-number: QTBUG-16987
Reviewed-by: Olivier Goffart
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
When creating a substring, JSC::UStringImpl required that the
base string pointer was 8-byte aligned. However, on platforms
where FastMalloc isn't enabled (such as Symbian), it's possible
that the system malloc() returns a pointer that is only 4-byte
aligned. (On Symbian, this can happen if the argument to malloc()
itself isn't a multiple of 8.)
Cherry-picked http://trac.webkit.org/changeset/54743 from WebKit
trunk, which fixes this issue. (The commit happened shortly after
we rebased QtScript/JSC for 4.7, so it applies cleanly to our copy.)
Task-number: QTBUG-16828
Reviewed-by: Simon Hausmann
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
In Qt 4.6 as well as 4.7's QCoreApplication and QEventLoop, calling
exec() always enters the event loop, even if you had tried to
quit()/exit() it before entering, with one exception (noted in the
unit tests; this difference has been in Qt since at least Qt 4.2).
Add unit tests to ensure all of the three classes have the same
behaviour.
Decide if we want to match the behaviours in Qt 4.8.
Reviewed-by: Bradley T. Hughes
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
qsharedpointer_impl.h contains class definitions that are also
mirrored in qsharedpointer.h (which is there for qdoc3), so we have a
macro to stop processing.
Task-number: QTBUG-16912
Reviewed-by: Olivier Goffart
|
| | | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This used the orientation control QWidget attributes API from
maemo5, and provides a simple implementation for Symbian.
The essense of the implementation is that the latest setting
of one of these QWidget orientation attributes will set the
orientation for the whole app. Testing the attributes will return
only the last attribute set, it will not return the app orientation
state.
A new task, QTBUG-16972, has been created to provide a more
comprehensive implementation in the future. This may provide a more
effective emulation of the maemo5 behaviour, or may incorporate
further reaching concepts for QML rotations.
Task-number: QTBUG-11785
Reviewed-by: Shane Kearns
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix: define hotSpot for Gestures on Mac
Fix warnings in PSQL driver: handle VersionUnknown in switch
Fix warning in ODBC driver: passing NULL to non-pointer.
QNAM FTP: switch to binary mode before sending a SIZE command
Change the D-Bus signal filter to return NOT_YET_HANDLED for signals
Check if the interpolators have already been deleted.
Improve timer ID safety by using a serial counter per ID.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
If there is no hotSpot defined for a gesture it cannot be propagated
propperly within GraphicsView.
Task-number: QTBUG-16618
Reviewed-by: Denis Dzyubenko
|
| | | | | | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Warning was:
passing NULL to non-pointer argument 7 of 'SQLRETURN SQLGetDiagRecW(SQLSMALLINT, void*, SQLSMALLINT, SQLWCHAR*, SQLINTEGER*, SQLWCHAR*, SQLSMALLINT, SQLSMALLINT*)'
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
With some servers, SIZE is not allowed in ASCII mode or it may return
different sizes. Since we transfer in binary anyway, better get the
size in binary too.
Reviewed-by: Peter Hartmann
|
| | | | | | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
During application destruction, the order in which static destructors
is run is undetermined. So avoid a null-pointer dereference.
Task-number: QTBUG-16855
Reviewed-by: Robin Burchell
Patch by task reporter
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The high bits of the counter are not used, so we store a serial
counter there.
This has nothing to do with the serial counter used in
nextFreeTimerId, which is there for ABA protection.
Reviewed-by: Bradley T. Hughes
|
| | | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QComboBox popup incorrectly opened in Sym^3
|
| | | | |/ / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QCombobox popup opens into incorrect position in Sym^3. This is due
to that there is a new layout in use, where softkeys are positioned
at the bottom. The current implementation just checks if native stacon
component is in use and if not, puts the popup to left/right border
of the application area (depending on UI direction).
Task-number: QTBUG-16886
Reviewed-by: Miikka Heikkinen
|
| |\ \ \ \ \ \
| |_|_|_|/ /
|/| | | | /
| | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
Split QScriptQObject test into smaller functions
Split QScriptEngine test into smaller functions
Split QScriptContext autotest into smaller functions
Improve QScriptClass test coverage
Bring back "classic" iteration order of QScriptClass properties
Split QScriptClass autotest into smaller functions
|
| | |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
In the old back-end, normal JS properties were iterated before
QScriptClass properties. There wasn't any good reason to change
that. Now we can get rid of that left-over XFAIL as well.
Task-number: QTBUG-16746
Reviewed-by: Jedrzej Nowacki
|
