| 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/oslo-staging-1:
Fix building of examples with -no-webkit
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Olivier Goffart
Merge-request: 1084
|
| |\ \ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
Add new tests cases to context tests.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
New tests mostly check thisObject and globalObject behavior in
conjunction with popScope and pushScope functions.
Reviewed-by: Kent Hansen
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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.
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
Fix builds with compilers without --with-fpu=neon as a default.
Improve performance of partial updates in raster window surface on X11.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | |\ \ \ \ \
| | |/ / / /
| | | | | |
| | | | | |
| | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
Fixed MIT-SHM errors in QNativeImage.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (173 commits)
Refactoring of tst_QScriptEngine::automaticSemicolonInsertion test.
Add new test to tst_QScriptContextInfo.
Incorrect comparison result in QString::locale
Cocoa/Alien: fix qgraphicseffectsource autotest
Cocoa: fix qgraphicsview autotest
Cocoa: fix autotest, qgraphicsview::moveItemWhileScrolling
reduce some symbian-specific TS files for qt to RTL marker
configure: fixed configure on mac.
Fixed a stupid typo
Lighthouse: License headers to new files in testlite
Make sure we blit the fbo on flush in QGLWindowSurface
Lighthouse: Wayland. Make the wayland integration closer to Lighthosue
Lighthouse: Wayland, only make one fbo for the WaylandPaintDevice
Making clearer separation between responsibility of different classes
Make it possible to vertically mirror gl painting
Lighthouse:Wayland Moving some logic into files
Make sure QStateMachine stops when it's told to
Add util/xkbdatagen/README
Application background is incorrect if app locked to landscape.
Cocoa: non-native toolbar shows in window when hidden
...
|
| |\ \ \ \ \ \
| | |_|_|/ /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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-air-staging:
Add QScriptClass/ByteArray benchmark
Add Context2D QtScript benchmark
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reuse the ByteArray implementation from
examples/script/customclass and create a benchmark out of it.
This benchmark actually measures a meaningful, real-world
use case for QScriptClass.
Task-number: QTBUG-17192
Reviewed-by: Jedrzej Nowacki
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reuse the Context2D implementation from
examples/script/context2d and create a benchmark out of it.
This benchmark actually measures a meaningful, real-world
use case.
Task-number: QTBUG-17192
Reviewed-by: Jedrzej Nowacki
|
| |\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Change e0c2861976e06658a1d651941310407c15b0bcde fixed es1 configure by
only picking EGL/egl.h if GLES/egl.h is not found. This broke es2
configure on platforms where both EGL/egl.h and GLES/egl.h are present,
by picking GLES/egl.h instead of EGL/egl.h, which implicitly pulled in
the GLES/gl.h header as well, causing inconsistent declarations due to
both GLES2/gl2.h and GLES/gl.h getting included. Instead, we need to
prioritize depending on whether we're using es1 or es2. For es1, we
prefer GLES/egl.h, and for es2, we prefer EGL/egl.h. If only one of the
headers is found we still use it unconditionally, to preserve the
existing behaviour and minimize the risk of breaking other platforms.
Reviewed-by: Ritt Konstantin
Reviewed-by: Marius Storm-Olsen
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
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
|
| | | |\ \ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix for QTBUG-17035
Carefull free the data from XGetWindowProperty on X11.
Fixes memory leaks in QX11Embed
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
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
|
| | |\ \ \ \ \ \ \ \ |
|
| | |\ \ \ \ \ \ \ \ \
| | | |/ / / / / / /
| | |/| | | | | | | |
|
| | | |\ \ \ \ \ \ \ \
| | | | |/ / / / / /
| | | |/| | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Don't ignore source-text when generating qsTrId translations for QML
Fix a crash when undoing form layout
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Reviewed-by: ossi
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
In a rare case when breaking a layout might
make widgets overlap, the internal heuristic
failed when recreating an original layout during undo.
Some widgets were removed from the grid.
The patch fixes this heuristic (makes sure
we don't remove other widgets). Creating
a form layout from overlapping widgets works
better now.
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Task-number: QTCREATORBUG-3616
|
| | |\ \ \ \ \ \ \ \ \
| | |_|_|_|_|/ / / /
| |/| | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
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:
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
Make syncqt not complain about missing header macros.
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.
QComboBox popup incorrectly opened in Sym^3
|
| | | |\ \ \ \ \ \ \ \
| | | |/ / / / / / /
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
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.
|
| | | | | |\ \ \ \ \ \
| | | |/ / / / / / /
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
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
|
