| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| | |
Conflicts:
qmake/generators/symbian/symmake.cpp
src/gui/image/qimage.cpp
src/openvg/qwindowsurface_vgegl.cpp
|
| | | |
|
| | | |
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Autotest: same as previous commit
Autotest: fix network test failure
|
| | | | |
|
| | | | |
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Enable preserved swap behavior when surface is created due to resize.
Generate triggered signal even the action launches menu in Symbian.
Symbian emulator: unload file server so apps can be recompiled.
Clear QFontCache TLS content before nullifying TLS pointer.
Fixed focus and window activation events on Symbian when opening menu.
QTBUG-4887 and other exception safety fixes
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QTBUG-4887 and other exception safety fixes
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This change includes a fix for QTBUG-4887 and other exception safety
problems found while testing it.
The QTBUG-4887 fix is to qimage.cpp. QImage doesn't throw exceptions on
failure like a proper class should, instead it tries to fail "nice".
What happens here is that setAlphaChannel would crash on OOM as after
the convertToFormat call, d could be NULL. This new version checks the
result of the conversion before using it.
The other fixes are all cases where exceptions were thrown from
destructors. I added code to the test app to help debug these cases,
and I fixed all the problems I found.
With these changes, tst_exceptionsafety_objects runs and passes on the
Symbian emulator.
Reviewed-by: Shane Kearns
|
| | |\ \ \ \
| | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Doc: we don't ship a qconfig executable in the Windows CE packages
Fixed possible data corruption in the triangulating stroker.
Fixed caching of QPainter patterns in the GL 2 engine.
Fixes CursorChange and TooltipChange events delivery for QGraphicsWidget
QTableView: fix spans corruption when removing spans.
Fixes painting artifacts when scaling a QGraphicsProxyWidget.
Fix <MemLeak> valgrind report shows memory leak for QImage::save().
Fix test sql for sql server.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
As the documentation mentions, these two events are delivered
respectively after the cursor has changed and after the tooltip has
changed. These two events were previously delivered just before.
This patch is needed for fixing QTBUG-5349 even if it is not directly
related.
Auto-test included.
Reviewed-by: bnilsen
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
- We should not do -1 after erasing, as it is done later on.
- We should consider the 0 height even if it is not the last span.
- Added an assert.
Task-number: QTBUG-9631
Reviewed-by: Gabriel
|
| | | |\ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix test sql for sql server.
|
| | | | |/
| | | |
| | | |
| | | | |
Sql server requires explicitly setting fields to be nullable.
|
| |\ \ \ \
| |/ / / |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
In 4.5, changing the prototype of the (custom) global object used
to "Just Work"(tm).
In the JSC-based back-end, the built-in global object acts as a
proxy if a custom global object is set, because JSC doesn't (yet,
anyway) provide a way to replace the global object.
To complicate this further, we also have a proxy to the original
global object (that bypasses the custom global object proxying (!)).
This is so that properties of the original global object can
still be accessed with the QtScript C++ API when a custom global
object has been set.
Unfortunately, JSObject::prototype()/setPrototype() are not virtual,
meaning that a change of prototype in the source object is not
reflected in the proxy or vice versa.
Work around this for now by syncing the prototype at the appropriate
places (QScriptEngine::setGlobalObject(), QScriptValue::setPrototype()).
This fixes all except the case when a prototype is set from JS,
since such a write doesn't go through our public C++ API. But this
case can be detected and handled by the global object's
JSObject::put() reimplementation. Created a separate report for that
issue: QTBUG-9737.
Task-number: QTBUG-7066
Reviewed-by: Jedrzej Nowacki
|
| |\ \ \ \
| |/ / / |
|
| | |/ /
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| |\ \ \
| |/ /
| | |
| | |
| | | |
Conflicts:
src/multimedia/audio/qaudioinput_win32_p.h
|
| | |/
| |
| |
| | |
Reviewed-by: jason mcdonald
|
| | |
| |
| |
| | |
Reviewed-by: rohan mcgovern
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Needs investigation of autotest failures on QWS, osx, win platforms.
This reverts commit 741b75b8e595a26944ba8fca8835463787b02676.
Conflicts:
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
|
| | |\
| | |
| | |
| | |
| | | |
Conflicts:
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
|
| | | |
| | |
| | |
| | |
| | | |
Merge-request: 541
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | |\ \
| | | |
| | | |
| | | | |
into 4.6-multimedia
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: rohan mcgovern
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Revert "Make s60main static lib not depend on QtCore"
Fix regression on Symbian
Fix broken test case
Cleanup the deployment code
Fix 'make sis' finding the dll on symbian
Re-add line that was lost during webkit update.
Work around bad naming of exported class in symbian sdk causing conflict
Fix building on public symbian SDK.
Fix qmake with the symbian makespec failing when project has a dash in it
Make s60main static lib not depend on QtCore
Remove stray non-latin1 character
Fix out-of-source symbian build for external apps
Update EABI def files for 4.7
Exporting QFontDatabase::removeAllApplicationFonts()
Adding QFontDatabase::removeAllApplicationFonts()
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
demos/declarative/minehunt/minehunt.pro
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix regression on Symbian
Fix broken test case
Cleanup the deployment code
Fix 'make sis' finding the dll on symbian
Re-add line that was lost during webkit update.
Work around bad naming of exported class in symbian sdk causing conflict
Fix building on public symbian SDK.
Fix qmake with the symbian makespec failing when project has a dash in it
Make s60main static lib not depend on QtCore
Remove stray non-latin1 character
Fix out-of-source symbian build for external apps
Update EABI def files for 4.7
Exporting QFontDatabase::removeAllApplicationFonts()
Adding QFontDatabase::removeAllApplicationFonts()
|
| | | |\ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix regression on Symbian
Fix broken test case
Cleanup the deployment code
Fix 'make sis' finding the dll on symbian
Re-add line that was lost during webkit update.
Work around bad naming of exported class in symbian sdk causing conflict
Fix building on public symbian SDK.
Fix qmake with the symbian makespec failing when project has a dash in it
Make s60main static lib not depend on QtCore
Remove stray non-latin1 character
Fix out-of-source symbian build for external apps
Update EABI def files for 4.7
Exporting QFontDatabase::removeAllApplicationFonts()
Adding QFontDatabase::removeAllApplicationFonts()
|
| | | | |\ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix regression on Symbian
Fix broken test case
Cleanup the deployment code
Fix 'make sis' finding the dll on symbian
Re-add line that was lost during webkit update.
Work around bad naming of exported class in symbian sdk causing conflict
Fix building on public symbian SDK.
Fix qmake with the symbian makespec failing when project has a dash in it
Make s60main static lib not depend on QtCore
Remove stray non-latin1 character
Fix out-of-source symbian build for external apps
Update EABI def files for 4.7
Exporting QFontDatabase::removeAllApplicationFonts()
Adding QFontDatabase::removeAllApplicationFonts()
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Symbian and WinCE don't have . and .. directory entries.
Other test cases in this autotest make allowance for this, so I have
done the same thing for the updateFileLists test case.
Reviewed-by: mread
|
| | |_|_|_|/ / / /
|/| | | | | | |
| | | | | | | |
| | | | | | | | |
All public includes are clean for QtDeclarative now.
|
| |\ \ \ \ \ \ \ \
| |/ / / / / / /
|/| | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (24 commits)
Fix loading of _debug.dylib plugins under OSX.
Remove strange binding loop in Repeater test.
Improve Transform docs.
Add media elements to the QML Elements docs.
Doc fix
typo
Test cost of importing and resolving types (but not creating objects).
Make QML 'hello world' tutorial less confusing.
ModelNode::setObjectValue() must update the object cache.
Doc improvements, fixes
Remove references to deleted qmldebugger.
Fix Rectangle::gradient rotation doc.
Fix Flickable::visibleArea.xPosition, Flickable::visibleArea.yPosition docs
import "." first - i.e. override it by everything else.
Set positioner size to final size, rather than some random size mid animation
Remove effects from element list.
Fix imageprovider example compilation on Symbian arm
Remove capability flag not available in public SDKs
Fix plugin example compilation on Symbian arm
Fix compilation on Symbian winscw
...
|
| | | | | | | | | |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-9509
|
| | |\ \ \ \ \ \ \ |
|
| | | |\ \ \ \ \ \ \ |
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Task-number: QTBUG-9559
|
| | | |/ / / / / / /
| |/| | | | | | |
| | | | | | | | |
| | | | | | | | | |
Otherwise, simple things break, like having "image.qml" on a case-insensitive file system.
|
| | |\ \ \ \ \ \ \ \
| | |/ / / / / / / |
|
| | | |\ \ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | |
| | | | | | | | |
| | | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fixed: Declared properties cannot be assigned in declaration
|
| | | | |/ / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-7860
|
| | | | | | | | | |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
not passes
|
| |\ \ \ \ \ \ \ \
| | |/ / / / / /
| |/| | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
src/gui/text/qstatictext.cpp
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
... as this is what gettext processors expect.
|
