| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
| |
When the 10.7 SDK was specified explicitly then it would fail the check
inside the pro file. So this ensures that this is accounted for.
Task-number: QTBUG-20516
Merge-request: 2657
Reviewed-by: ossi
|
| |
|
|
|
|
|
| |
PMO Bug 275663.
Developed by Aapo Makela, reviewed by me.
|
|\
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Prevent failed rendering for NPOT textures in GLES2.
Don't use GL_REPEAT for NPOT textures in GLES2.
|
| |
| |
| |
| |
| |
| |
| | |
Shouldn't use the (default) GL_REPEAT wrap mode on GLES2 unless
GL_OES_texture_npot is present.
Reviewed-by: Kim
|
|\ \
| |/
|/|
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixing WINSCW compile error
|
| |
| |
| |
| |
| |
| |
| |
| | |
Refactoring the body of a large TRAP into a separate function. This was
not compiling on WINSCW, perhaps due to the use of #ifdef within the
TRAP macro expansion. It does compile now.
Reviewed-by: Sami Merila
|
|/
|
|
|
|
|
| |
or hidden.
Merge-request: 1287
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
|
|
|
|
| |
The plugin was ignoring errors when opening a handle, and as a result
crashed if the handle was invalid.
Error checking / handle validity checks added.
Task-number: QTBUG-18572
Reviewed-by: mread
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The webkit AtomicallyInitializedStatic and Qt's Q_GLOBAL_STATIC can
deadlock on the Mac, as the mac compiler inserts calls to
__cxa_guard_acquire and __cxa_guard_release around initialisation of
local statics.
In Q_GLOBAL_STATIC case, this is the QGlobalStaticDeleter local static
Whereas webkit AtomicallyInitializedStatic is a local static variable
in any case.
Problem is triggered because webkit constructs QNetworkConfigurationManager
inside the constructor of a local static - networkStateNotifier
And the generic bearer plugin calls QNetworkInterface::allInterfaces
in the bearer thread, which needs an initialised Q_GLOBAL_STATIC.
Reviewed-by: Laszlo Agocs
|
|\
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Update internal state before emitting configurationChanged() signals.
|
| |
| |
| |
| | |
PMO Bug 257336.
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed contains check casing in mmf.pro file
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Contains check in mmf.pro was spelled in upper case, but qmake's
internal contains function isn't case-insensitive and needs to be
spelled in lower case.
Reviewed-by: Miikka Heikkinen
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed more CI-errors caused by qmlshadersplugin addition.
Fixed CI-errors caused by qmlshadersplugin addition.
Fixing Linux compatibility issues for Symbian
Update the detection of is_using_gnupoc for S3.
Backported QML ShaderEffectItem from QML2.0 into Qt Quick 1.1
Revert "Fixing Linux compatibility issues for Symbian"
sockets: limit buffer size of the internal sockets in proxy engines
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The patch applies everything from the original, except for the
filename case changes in LIBS which are handled differently
based on the auto-detected is_using_gnupoc CONFIG value.
Reviewed-by: Laszlo Agocs
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Changing the library names to lowercase breaks 5.0-based
Linux builds. It will be investigated if it is possible to
change the SDKs instead. If not, the patch will have to be
extended to use the original names for 5.0 and the lowercased
ones otherwise.
This reverts commit 5933d4e4fb8b48ebed641e7f6b1d032df253df30.
|
|\ \ \
| |/ /
|/| /
| |/
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix the state of default network configuration.
|
| |
| |
| |
| |
| |
| |
| | |
PMO Bug 257336 - Default configuration remains in QNetworkConfiguration::Active state even when device moves out of WLAN coverage
This fix sets the default network configuration (of type UserChoice) back to Discovered when the network session is disconnected.
Reviewed-by: Cristiano di Flora
|
|\ \
| |/
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix brush transform in QtDirectFB backend, fixing QTBUG-18577
|
| |
| |
| |
| |
| | |
Merge-request: 1224
Reviewed-by: Marcel Schuette <marcel.schuette@nokia.com>
|
|\ \
| |/
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
directfb: Paint engine enhancements
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Support negative scaling using DSBLIT_FLIP_HORIZONTAL/VERTICAL (DirectFB >= 1.4.3).
- Implement drawing points.
- Implement rectangular path filling.
- Discard drawing when alpha is zero with SrcOver.
- Also use DirectFB StretchBlit() if supported by hardware.
- Unify/simplify pen/brush/composition support handling.
- Enhance output when printing raster fallbacks.
- Other minor cleanups.
Merge-request: 991
Reviewed-by: Marcel Schuette <marcel.schuette@nokia.com>
|
|\ \
| |/
|/|
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixing Linux compatibility issues for Symbian
|
| |
| |
| |
| | |
Reviewed-by: Laszlo Agocs
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updating file with CRLF line endings for the updated header
Fix a regression in QList::mid()
update gitignore
remove -fno-stack-protector
Fix make confclean
Update licenseheader text in source files
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed bug in meego graphics system runtime switching.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Switch when the last _visible_ widget is destroyed (and also switch back
when a widget is mapped and there are no other visible widgets).
Reviewed-by: Armin Berres
|
|\ \ \ \
| |_|/ /
|/| | /
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix QtCoreu.def file error
Introduce platform extension to QGraphicsSystem
Update changes for 4.7.3
Show softkeys when opening a dialog that has a fullscreen parent.
QSslCertificate: report fraudulent certificates as invalid
QSslCertificate: fix test for blacklisted certs on Windows
QSslSocket internals: abort on encountering blacklisted certificates
QSslSocket: add test for blacklisted certificates
Changes for 4.7.3
Fix for wrong dpi metrics for raster pixmaps on Symbian.
Fix qgraphicstransform autotest for Symbian, where qreal is float.
QS60Style: QTreeView::indexRowSizeHint returns incorrect value
QDeclarativeDebug: Export needed symbols on Symbian
Bump Qt version to 4.7.3
Fix QTBUG-17627: build break in mobility bearer applications
Fix for major regression in OpenVG clipping
Unsuccessful unlocking of QNetworkConfigurationPrivate mutex
|
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Qt on Symbian needs some special capabilities to be able
to work on 32MB GPU. This patch introduces some Symbian
specific functions to QGraphicsSystem
Task-number: QTBUG-17882
Reviewed-by: Laszlo Agocs
|
|/
|
|
|
|
|
|
| |
-no-gui still tried to build the graphicssystem and inputmethod
plugins, both of which require QtGui
Merge-request: 1215
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
QDeclarativeDebug: Fix endless loop for property with SCRITABLE false
Fix Symbian/Linux compilation breakage in plugins/qmltooling
Make QMLViewer startup animation stop after a while
Fix excessive scrolling in TextInput with mid string pre-edit text.
|
| |
| |
| |
| |
| |
| |
| | |
use QIODevice header file instead of (wrongly capitablized) QIODevice.h
Reviewed-by: Tom Sutcliffe
Task-number: QTBUG-18869
|
| |
| |
| |
| |
| | |
Merge-request: 1187
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
QmlDebug: Fix license headers in new ost plugin
Fixed autotest after b4b85257ccff6ba21bcbcbd46a9f7f09884abe79
Resolve unqualified attached properties correctly
Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Symbian.
QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp'
QDeclarativeDebug: Don't crash when connection is closed
Fix so concurrent jobs produce the correct model results
Fix uninitialized variable.
|
| |
| |
| |
| | |
Reviewed-by: Trust-me
|
| |
| |
| |
| |
| |
| |
| | |
Symbian.
Task-number: QTBUG-18764
Reviewed-by: kkoehne
|
| |
| |
| |
| |
| |
| |
| | |
Make the name less ambiguous, especially on Symbian were all .dlls end
up in sys\bin.
Reviewed-by: Pawel Polanski
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Protocol might still be in the process of processing messages when
disconnect() is called (e.g. due to an invalid package). Therefore delay
it's deletion until the next event loop runs.
Reviewed-by: Christiaan Janssen
Task-number: QTBUG-18771
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed not switching to MeeGo graphicssystem.
Fixed rounding of coordinates pre-transformation in CG paintengine.
Don't include qwindowsurface_gl_p.h on QT_OPENGL_ES_1.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If two windows become maximized at once we might not switch, this is an
attempt at fixing that.
Reviewed-by: Armin Berres
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QMeeGoLivePixmapData: Verify dimensions of locked pixmap
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When a switch from HW rendering to SW rendering is done, all EGL
surfaces backing a live pixmap become invalid because EGL is
terminated. Thanks to a recent patch, all live images are now
automatically invalidated when SW rendering is activated.
Even with this mechanism in place, it is possible for the underlying EGL
surface to be different than what the live pixmap is expecting. This can
happen, for instance, if the X pixmap gets destroyed and a different X
drawable is created using the same XID. Even though this is an unlikely
scenario, it can result in a complete system failure if the surface
dimensions do not match and the live pixmap user ends up writing over
internal graphics driver structures.
This patch adds a safeguard which disallows locking EGL surfaces with
non-matching dimensions.
Fixes Harmattan bug NB#237138.
Merge-request: 2583
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Update changes for 4.7.3
directfb: avoid version dependency by setting DSPD_DST blend functions manually
fix -enable-stdcall-fixup usage
Report that an update is needed if no update was done
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 2558
Reviewed-by: Marcel Schuette <marcel.schuette@nokia.com>
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixes QT-4753
|
| | |
| | |
| | |
| | |
| | |
| | | |
Invalid read in ICD plugin for bearer management.
Reviewed-by: Iiro Kause
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Implement tiled image and pixmap drawing in VG paint engine.
Changed maximum heap size for qmlflickr on Symbian.
Change Symbian to use destroyed swap behaviour in GL
Remove useless profile reference.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The profile has been empty since the plugin functionality was moved
into QtMultimedia itself (d73df73c556b0a225fdde7341549ed834bc691f4).
RevBy: Miikka Heikkinen
|