| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit e90cff53cdd7bf0bdfed1f2e8efb90539c6f33ba)
Conflicts:
tools/qdoc3/test/qt-project.qdocconf
|
|
|
|
|
|
|
|
| |
Above mentioned mutex is locked twice: first in caller function and second time in called function. Called function unlocks mutex and emits signal clearly unaware that the mutex is actually still locked. I changed the mutex to be unlocked before the function is called.
Task-number: QTBUG-15108
Reviewed-by: Ville Pernu
(cherry picked from commit c15560fbe2a1762117395c5ecaaecfa5ab8dce6f)
|
|
|
|
|
|
|
|
|
|
|
|
| |
When color table value is read from ICO header memory allocation is
made based on this value. This case is relevant only when reading
8bit images. Therefore values over 256 will abort reading the image.
Task-number: QT-4535
Merge-request: 1090
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
(cherry picked from commit d6c1e5d78bdfbeb373970b65d8260f7e9f9ce1bd)
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
|
| |
On Windows, qmake places the tcpserver.dll in a 'plugins\qmlreleaseging'
folder, which broke remote debugging of QtDeclarative completely. New name
'qmltooling' while being not so specific, avoids the use of 'debug' in the folder name.
Task-number: QTBUG-17360
Reviewed-by: Martin Jones
(cherry picked from commit 2855782a45b08aedbed960125514fdd9663ff1c8)
|
|
|
|
|
| |
Reviewed-by: Christiaan Janssen
(cherry picked from commit 21016c3b28674029a2a205da38f54e362e3635b9)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
1. QNetworkSession being deleted from the closed signal caused data
abort or E32User-CBase 49 panics. (both observed)
2. Potential E32User-CBase 46 panic in
ConnectionProgressNotifier::StartNotifications()
Reviewed-by: Aaron Tunney
Reviewed-By: Markus Goetz
Task-Number: QTBUG-17196
(cherry picked from commit 8fe811e14b6db6a9637a5bf6d276613786291762)
|
|
|
|
| |
(cherry picked from commit 8eab49de0548363b18c6e2c7b4ff4a8b722992d6)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The Phonon API does not provide any way for the client to specify
which network connection should be used for streaming playback.
If the application already has a connection open, using a bearer
other than the default (e.g. using WiFi when the device default is
GPRS), it may be desirable to use it for streaming, rather than
allowing the Phonon backend to open a second connection on the
default bearer.
This patch adds a custom property on the Phonon::MediaObject,
called InternetAccessPointName. The client can specify the IAP
which Phonon should use by setting this property.
Note that support for this property is only provided in the Phonon
MMF backend.
Task-number: QTBUG-11436
Reviewed-by: Gareth Stockwell
(cherry picked from commit 1640acce5ca8f49c5655edffa2a1108048c5a414)
|
|
|
|
|
|
|
|
|
|
|
| |
Currently Symbian doesn't support semi-transparent EGL surfaces.
WA_TranslucentBackground attribute is ineffective if set after EGL
surface creation. To enable translucency in this case we need to
recreate backing store to get raster surface which supports translucency.
Task-number: QT-4416
Reviewed-by: Jason Barron
(cherry picked from commit d62e9f4a6fe199ae790b1561fd4ba9ea84bd4d1e)
|
|
|
|
|
| |
Reviewed-by: Trust Me
(cherry picked from commit ac5c099cc3c5b8c7eec7a49fdeb8a21037230350)
|
|\ |
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Currently QS60Style loads automatically a plugin to support tactile
feedback for styled applications. However, there is no control over
this, so applications cannot remove the automatic support, if they'd
like to use Mobility APIs to control the feedback themselves.
In order to avoid this, remove tactile feedback plugin from style.
Lets see if we can later put this back with optional enable/disable
flag.
Task-number: QTBUG-16151
Reviewed-by: Miikka Heikkinen
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The access point scanner cancels itself in the destructor.
This requires the handle to be valid, but it was closed in the symbian
engine destructor immediately before deleting the AP scanner.
Because of the way symbian active objects work, the crashing function
is only called if there was an asynchronous request in progress.
So it could be missed in cases where the scan completes faster than the
test case.
Task-number: QTBUG-16484
Reviewed-by: Markus Goetz
|
| |/
|/|
| |
| |
| |
| |
| | |
Not pixmap creation.
Merge-request: 988
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|/ |
|
|
|
|
|
|
|
| |
When parsing a new connection an access point with the same SSID may not
have been previously seen.
Task-number: QTBUG-15276
|
|
|
|
|
|
|
|
|
|
|
|
| |
In early system startup applications may try to use ICD before it is
contactable. Ensure that the connection to ICD is established before all
calls are made.
If ICD is still not contactable QDBusServiceWatcher is used to monitor
registration of the com.nokia.icd2 address and reconnection is attempted
once ICD is started.
Task-number: Maemo 199755
|
|
|
|
| |
RevBy: Trust me
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Check Qt::WA_TranslucentBackground instead of custom widget property.
New translucency API for the meego graphics system.
Support for 'qglTranslucent' in QGLWindowSurface.
Use a different dither distribution matrix + a bit of rand.
Fixed cubic bezier rendering bug in qgrayraster.
Revert "qgrayraster: Speed up rendering of small cubic splines."
Fix QWingedEdge memory usage issue
Make sure QMeeGoGraphicsSystem::setTranslucent can't be called if surface already created.
Prevent always deep-copying in QPixmap::toImage() for raster pixmaps.
Fix text disappearing on GL when RGB-path is taken (no transformation)
Fix for GCC on Windows x64.
Fix crash in QTextDocument::markContentsDirty
Make sure to do a deep copy of a QImage when it's being painted on.
|
| |
| |
| |
| |
| |
| |
| |
| | |
Also don't dither on edges.
Improves dithering over tiles/scaled smooth gradients.
Merge-request: 971
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
already created.
Merge-request: 967
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|/
|
|
| |
Fixes: NB#208617 - QtProxyFactory does not return correct (any) proxy data
|
|
|
|
|
|
|
| |
Fixes: NB#194509 - Network access from a Qt app makes dbus daemon
consume tons of cpu
Task-number: QT-4220
|
| |
|
|
|
|
|
| |
This variable cannot be dereferenced when it's zero, but let's silence
the compiler warning (GCC 4.4 on ARM).
|
|
|
|
|
|
|
| |
Just add some Q_UNUSED for parameters or remove the variable we don't
need for the others.
Reviewed-by: Trust Me
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (27 commits)
Use parent class function to generate Makefile headers in Symbian
Fix spaces
Fix QPixmap::fromImage() in the OpenVG pixmap backend.
Native color dialog on symbian
Fix non-stroked filled paths in OpenVG paint engine.
Fix symbian-mmp.conf include path
Fix a build break when namespace is defined
Fixed namespace issues related to epocroot.cpp
Corrected ASCII comparison and removed extra braces
Add symbian scope for qfiledialog_symbian.cpp
Resolve EPOCROOT in qt.conf using same logic as in .pro
Make epocroot resolving compatible with more build environments
Fix for QtOpenGL RVCT4 compilation error
Removed extra cpp and done changes based on comments
Correct flags for Symbian file dialogs
Fix for WServ 64 crash on Symbian.
Use include(original mkspec) instead of copying of mkspec to default
Fixed code style of d92cbfc5, reported by git push.
Switched qdesktopservices to use SchemeHandler for Symbian^3 and later.
Removed unnecessary Q_OS_SYMBIAN flags from qdesktopservices_s60.cpp.
...
|
| |\
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (21 commits)
Fixed handling of QInputMethodEvents with nonzero replacementLength.
Fixed namespace issues related to epocroot.cpp
Corrected ASCII comparison and removed extra braces
Add symbian scope for qfiledialog_symbian.cpp
Resolve EPOCROOT in qt.conf using same logic as in .pro
Make epocroot resolving compatible with more build environments
Fix for QtOpenGL RVCT4 compilation error
Removed extra cpp and done changes based on comments
Correct flags for Symbian file dialogs
Fix for WServ 64 crash on Symbian.
Use include(original mkspec) instead of copying of mkspec to default
Fixed code style of d92cbfc5, reported by git push.
Switched qdesktopservices to use SchemeHandler for Symbian^3 and later.
Removed unnecessary Q_OS_SYMBIAN flags from qdesktopservices_s60.cpp.
Documented usage of dialogs on Symbian
Native file dialog on Symbian^3
Add Location as self signable capability in patch_capabilities.pl
Localize .loc and .pkg content based on TRANSLATIONS
Bump Qt version to 4.7.2.
SSL: Fix for systemCaCertificates being called first on symbian
...
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Trust Me
|
|\ \ \ \ \
| | |_|_|/
| |/| | | |
|
| |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix compilation with Sun Studio 12.1.
Compile with QT_NO_PROXYSCREEN.
silence compiler warnings
Don't let posted events starve native dialogs (regression)
|
| | | |/
| | |/|
| | | |
| | | |
| | | | |
Merge-request: 931
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\ \ \ \
| |/ / / |
|
| |/ / |
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Due to somewhat questionable .pro-file flagging, the plugin is not
currently compiled at all for latest Sym^3 environments.
Flagging is now more bulletproof (not 3.1 & not 3.2), so even if the
upcoming platform versions change, this should work in the future.
Task-number: QTBUG-15428
Reviewed-by: Miikka Heikkinen
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QT-4155 bug.
Canceling Network Session before canceling connection notifier
notifications causes a call to an invalid RConnection instance.
Fix: CanceL Network session after canceling notifications.
|
| | |
| | |
| | |
| | |
| | |
| | | |
Fix minor stylistic issue raised by Oswald
Removed duplicate sourceSurface pointer introduced by sibling merge request
|
| |/
| |
| |
| |
| |
| | |
Merge-request: 915
Reviewed-by: Donald Carr <donald.carr@nokia.com>
(cherry picked from commit b62079cf17044e09999eb1808788926ea921fb05)
|
| |
| |
| |
| |
| |
| |
| |
| | |
Fixing the initial problem of this error opened up a possibility to
start a new WLAN scan while there was one still ongoing. This caused
a crash.
Task-number: QT-3996
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Minor adjustments to merge-request 915
Implement brush transformations for directfb.
Add FreeBSD's certificate bundle to the certificates list.
SSL internals: upon error, read all errors from OpenSSL
Added an example for QTest::touchEvent to the documentation.
Push and pop the thread-default context for the current thread
Fix compilation by s/intptr_t/quintptr/
|
| |
| |
| |
| |
| |
| | |
Fix minor stylistic issue raised by Oswald
Removed duplicate sourceSurface pointer introduced by sibling merge request
|
| |
| |
| |
| |
| |
| | |
Merge-request: 915
Reviewed-by: Donald Carr <donald.carr@nokia.com>
(cherry picked from commit b62079cf17044e09999eb1808788926ea921fb05)
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Coding style: bang cleanup.
Removed call to glFinish, obsoleted by fence syncs.
Helper-side support for QMeeGoFenceSync.
Plugin-side support for creating/destroying/waiting on fence sync.
Added MeeGo graphicssystem entry points for KHR_fence_sync.
Trailing whitespace fixes.
|
| |
| |
| |
| |
| | |
Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| |
| |
| |
| |
| | |
Merge-request: 2502
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|