| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
qdeclarativestateoperations.cpp in declarative module needs to include
qgraphicsitem.h. In windows CE, the qgraphicsitem.h further needs to
include qfunctions_wince.h. qfunctions_wince.h is used to implement
posix functions missing from WinCE. One of reimplemented functions in
qfunctions_wince.h is posix rewind. Now qdeclarativestateoperations.cpp
also implements method called rewind with different prototype. Two
incompatible prototypes of rewind break the QtDeclarative build
for WinCE.
As a workaround the POSIX rewind reimplemented by qfunctions_wince.h
is now undefined in this class, because it is not needed here.
Task-number: QTBUG-22511
Change-Id: I9e569fa753e70b386068f54d95c3aae0a2dbe55d
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
| |
|
|
|
|
|
|
|
| |
Task-number: QTBUG-22512
Change-Id: I6894259faa3af6171a3f5313357d222e45b48af3
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
| |
|
|
|
|
|
|
|
|
|
| |
MSVC reported the following warning when compiling declarative module:
'MethodData' : type name first seen using 'class' now seen using 'struct'
Fixed by changing the forward declaration from class to struct.
Task-number: QTBUG-22512
Change-Id: I066feea80115d1d968332933d78e0408cd92a70a
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Deactivation can happen for example if some notification dialog opens
on top of the application. In this case the PinchFinished signal was not
emitted.
It is fixed so that when the QDeclarativePinchArea component receives
QEvent::WindowDeactivate event, the ongoing touch activity is cancelled,
which causes the pinch to finish. Also if QEvent::TouchUpdate event is
received without receiving QEvent::TouchBegin event first, the
QEvent::TouchUpdate event will not cause the updatePinch() method to be
called.
Task-number: ou1cimx1#948030
Change-Id: Ib8b9e1a022415be06f1a8e778b887418f32c75ef
Reviewed-by: Murray Read <ext-murray.2.read@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
|
| |
|
|
|
|
|
| |
Task-number: QTBUG-22512
Change-Id: I9acde5b799aa12c9de6e3321003bd5dcc4bb853d
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
|
| |
|
|
|
|
|
|
| |
Inserting new items used a different threshold than removing items
outside the view in refill.
Change-Id: Id3605122a7a31caf0b661e78b5d868ceb3f01e20
Reviewed-by: Bea Lam <bea.lam@nokia.com>
|
| |
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
| |
|
|
|
|
|
|
|
|
| |
Although "Qml debugging is enabled. Only use this in a safe environment!"
is a warning, using qWarning() for it let every app crash that is run with
QT_FATAL_WARNINGS. Fix that by using qDebug() for the updates that
happen during 'normal' operation.
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Change-Id: Ie37a35ca27ec6e507f7de140484ca8cf96410be2
|
| |
|
|
|
|
|
|
| |
Use the stream operator instead of toAscii().constData(), or qPrintable.
Also use QString::fromLatin1() instead of QString::fromAscii().
Task-number: QTBUG-22860
Change-Id: Iabe37778f0fd50ca450f0504939441c633d6354e
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (23 commits)
Added missing license header.
Adjust pathes once again.
Fixed a link
Fixed a link
Split behavior and wigglytext examples
Rename files to show up in docs.
Whitespace changes and added depends.
Fix up examples.
Fixed some linking issues.
Removed unecessary files from folders.
Fixes for the manifest and links.
Changed some of the short descriptions for WebView examples.
Removed unecessary duplicate files.
Fix link to WebView examples.
Fix link to ListView and WebView example pages.
Fixed lists to be ordered lists and added curly brackets
Change the links to behavior examples.
Fix warning about unbalanced parantheses.
Fix abstractitemmodel compilation error.
Split ListView and WebView examples.
...
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Fix Linux-Symbian parallel cross-compilation configure step
Symbian: don't merge native clipboard, overwrite.
Surviving out of memory in Qt Quick app
Export QtGui functions required by QtMultimediaKit backend
fix bearer crash
Fix alignment of non-wrapped richtext QML Text elements.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The QtQuickPlayground app contains a version of samegame which allow
the user to edit the code. By setting the ball size to 8, the app can
run out of memory. This leaves it in a pretty bad state. But apps
on Symbian shouldn't crash due to OOM and should allow some operation.
This change fixes the immediate OOM crashes in declarative, gui and
corelib. It shows warning dialogs which explain what has gone wrong and
leaves the app in a state that can be exited cleanly
from the Symbian task list.
Task-number: QT-5319
Reviewed-by: Shane Kearns
Reviewed-by: Gareth Stockwell
Reviewed-by: Martin Jones
|
| | |\ \
| | |/ |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QTextDocument needs to know the actual control width rather than
the text width to be able to align the text to the control.
Task-number: ou1cimx1#934687
Reviewed-by: Joona Petrell
|
| |\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
Sequential reading not supported.
DeclarativeDebugServer: Instantiate QPluginLoader on heap
Fix failing unit tests.
qmlplugindump: Fix dumping empty names for generated QMetaObjects.
Fix compile with -qtnamespace
Properly protect access to pixmap reader thread with mutex
Move tga support from Qt3d to Qt.
Move tga support from Qt3d to Qt.
Properly protect access to pixmap reader thread with mutex
qmlplugindump: Add flush to fix output redirection on windows.
|
| | |\ \ |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The pluginloader is instantiated on heap with server as its parent
so that the connection plugin instance remains loaded in memory.
This prevents the plugin loader in QDeclarativeInspectorService
to accidentally un-load the plugin while it's in use.
Change-Id: I11c82ce595a336ba0fd1b243d23cb497fe355147
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Previously, access to the data from the reader thread wasn't guarded
properly, causing a crash when the reader thread was deleted prior to
QDeclarativePixmapData (which then attempted to dereference the
thread pointer to cancel the request), or in the case where a
QDeclarativePixmapData was deleted after its QDeclarativePixmapReply
was removed from the jobs queue but prior to processing.
Reviewed-by: Martin Jones
Task-number: QTBUG-22125
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Previously, access to the data from the reader thread wasn't guarded
properly, causing a crash when the reader thread was deleted prior to
QDeclarativePixmapData (which then attempted to dereference the
thread pointer to cancel the request), or in the case where a
QDeclarativePixmapData was deleted after its QDeclarativePixmapReply
was removed from the jobs queue but prior to processing.
Reviewed-by: Martin Jones
Task-number: QTBUG-22125
|
| |\ \ \ \
| |_|_|/
|/| | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Properly protect access to pixmap reader thread with mutex
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Previously, access to the data from the reader thread wasn't guarded
properly, causing a crash when the reader thread was deleted prior to
QDeclarativePixmapData (which then attempted to dereference the
thread pointer to cancel the request), or in the case where a
QDeclarativePixmapData was deleted after its QDeclarativePixmapReply
was removed from the jobs queue but prior to processing.
Reviewed-by: Martin Jones
Task-number: QTBUG-22125
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/mainpage.qdoc
doc/src/platforms/supported-platforms.qdoc
doc/src/qt-webpages.qdoc
src/network/access/qnetworkdiskcache.cpp
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
If there is no delegate then clear state and return.
Change-Id: I786b9bc4018706797056fbd1ad25d25663102707
Task-number: QTBUG-22379
Reviewed-by: Andrew den Exter
|
| |\ \ \ \ \
| |/ / / /
| | / / /
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/corelib/kernel/qeventdispatcher_symbian.cpp
src/declarative/qml/qdeclarativetypeloader.cpp
src/imports/gestures/gestures.pro
src/imports/particles/particles.pro
src/opengl/qgl.cpp
src/opengl/qgl_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
tests/auto/declarative/qdeclarativescriptdebugging/qdeclarativescriptdebugging.pro
tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro
tests/auto/qaudioinput/qaudioinput.pro
tests/auto/qaudiooutput/qaudiooutput.pro
tests/auto/qchar/qchar.pro
tests/auto/qclipboard/test/test.pro
tests/auto/qsound/qsound.pro
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix crash on exit when overriding signal handlers in states.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Change-Id: I0e73948f18aa1b78c7e92677167673b84a90a450
Task-number: QTBUG-21617
Reviewed-by: Martin Jones
|
| | |\ \ \ \
| | |/ / /
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Cannot flick to the end of a horizontal list view width LayoutMirroring
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
minXExtent calculated the offset due to highlight range incorrectly
(reversed) when mirroring enabled. Also us same algorithm for fixup()
in GridView and ListView uses.
Change-Id: Id7e7e540a894d6f520685b237d34b4186bc427b6
Task-number: QTBUG-21756
Reviewed-by: Bea Lam
|
| | |\ \ \ \
| | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Backport more imports directory caching changes.
Fix more test DEPLOYMENT statements for Symbian
Fix deployment for declarative tests, examples on Symbian
Fix StrictlyEnforceRange with snapOneItem/Row and header behavior, pt 2
Backport imports directory caching performance optimization
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fixes error reporting on Windows.
Change-Id: I49b559aa9d0c227be4e8e3d0fdc43c402273a302
Task-number: QTBUG-15899
Reviewed-by: Damian Jansen
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Change cf23188de237009136fa1480ab8fd9e3ca364769 changed the positioning
of a view with StrictlyEnforceRange, snapOneItem/Row, and a header,
such that the view was positioned at the beginning of the header,
rather than on the first item.
Change f85819fe083ae7c6804c884de68e906d153a6d11 partially fixed the
problem. This change handles the case of the header/footer being
large enough to cause a snap item not to be found when the view
is dragged beyond the first/last item. In this case snap to the
currentItem.
Change-Id: I08b7e61496a79f71c3b40fafaca985ae90f88503
Task-number: QTTH-1501
Reviewed-by: Bea Lam
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Backported from Qt5 change a6da3b26
Change-Id: Ib1715f3d5c144775e475426ce4471000b5ae0645
Task-number: QTBUG-15899
|
| |\ \ \ \ \ |
|
| | |\ \ \ \ \
| | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
doc/src/getting-started/installation.qdoc
doc/src/platforms/platform-notes.qdoc
src/corelib/tools/qlocale_symbian.cpp
src/gui/kernel/qwidget_p.h
src/network/access/qnetworkaccesshttpbackend.cpp
src/opengl/qgl.cpp
src/plugins/bearer/symbian/qnetworksession_impl.cpp
|
| | | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
A patch for 'Fix to QtOpenGL crash'
Always recreate backing store when TLW transparency changes
Crash in QDeclarativeCompiler::indexOfProperty
Fix to QtOpenGL crash
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
In QDeclarativePropertyCache, plain integer bitfield overrideIndex is
initialized with -1 in class constructor. Unfortunately, ARM compiler
treats bitfields as unsigned, unless explicitly defined as signed [1].
Therefore, overrideIndex actually gets initial value of 2147483647,
which causes array operations done with the index to fail.
As a fix, define overrideIndex as signed int bitfield.
[1] http://www.keil.com/support/man/docs/armccref/armccref_Babjddhe.htm
Under bitfields/Note: "A plain bitfield, declared without either
signed or unsigned qualifiers, is treated as unsigned"
Task-number: QT-5285
Reviewed-by: Aaron Kennedy
|
| | | |\ \ \ \ \
| | | |/ / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QML import path puts Qt dirs in correct Symbian order
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The QML import path contains an entry for the standard
import location on each drive on Symbian. These were
being ordered so that Z:, the ROM drive, was listed
first. In fact the drive order was the reverse of the
normal Symbian drive search order. This had the effect
that upgraded versions of QML imports installed on
the device were generally ignored for older ROM based
versions.
The import path has now been changed to match the normal
Symbian drive search order. This will make it more likely
for upgraded QML imports to be picked up and used.
Task-number: QTBUG-21409
Reviewed-by: Shane Kearns
Reviewed-by: Martin Jones
|
| | |\ \ \ \ \ \
| | | |_|_|/ /
| | |/| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
QDeclarativeDebug: Fix autotest breakage in qdeclarativedebugjs
Fix assert
Compile fix for Symbian
Debugger: Fix autotest breakage
Debugger: Rename qdeclarativedebug* to qdeclarativeenginedebug*
Rename QDeclarativeEngineDebugServer to ~Service
Fix aliasing bug when compiled with gcc 4.6
Debugger: Move QT_DECLARATIVE_DEBUG handling out of qdeclarative.h
FocusScope's focusItem must always be a descendent
QDeclarativeDebugJs: Disable unstable autotest
Add qdeclarativedebugjs autotests to declarative.pro
tests: Use CONFIG option instead of QDeclarativeDebugHelper class
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
In case a service is waiting for messages via waitForMessage, deliver
all arriving messages to the service directly, not only the first one.
In the case of QDeclarativeDebugJS::watchExpressions() test case,
the first message is actually WATCH_EXPRESSIONS , followed by
BREAKPOINTS. However, the second BREAKPOINTS command wasn't
delivered directly, but queued in the main event loop. As soon as
waitForMessage() was returning, QJSDebugClient was just calling
waitForMessage() anew (because BREAKPOINTS wasn't delivered yet),
blocking the main event loop from being run.
Reviewed-by: Aurindam Jana
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | |\ \ \ \ \
| | | | |_|_|/
| | | |/| | | |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Change-Id: I0c289bdf555aa317dc12c5dbcff0168ebcc7bd50
Reviewed-on: http://codereview.qt.nokia.com/3935
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
(cherrypicked from a07f68eff5ac4696a551f083d186a685f7ef043d)
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
And fix the file names/location, too
Change-Id: If2d5ec0896332896ad11af748ec8f75c39e1555c
Reviewed-on: http://codereview.qt.nokia.com/3890
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
(cherrypicked from 8804ec49bda8672c5700ab843f2958c3d2bd8e41)
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Apps don't have to (directly or indirectly) include qdeclarative.h.
Instead, move the static instance to qdeclarativeengine.h, and
qdeclarativeview.h (which instantiates it's own engine).
Change-Id: I8b3e63ad4f134969734a2cc712395145d90e0dfa
Reviewed-on: http://codereview.qt.nokia.com/3941
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
(cherrypicked from commit 6cb39fb829b78b5f6e9751283c7cd50400821e2a)
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-21265
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
In Symbian, the sqlite database doesn't like mixing native and Qt
separators in the database name, so ensure only native separators are
used when declarative sets the database name.
Task-number: QTBUG-20836
Reviewed-by: Sami Merila
|
| |/ / / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Declarative had a number of places where double operations were used
instead of qreal, due to the use of double literals. These are now
constructed as qreal literals so that qreal operations are used.
This makes no difference where qreal is double. But on Symbian, qreal
is float, and this give a performance boost for floating point intensive
code.
Task-number: QTBUG-4894
Reviewed-by: Martin Jones
|
