| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
errno in zutil.c is leftover, and not used anymore -> removed.
In gzguts.h qfunctions_wince.h are included. To use this header
qglobal.h is needed.
In qfunctions_wince.h a special define section is added for
zlib.
Task-number: QTBUG-22507
Change-Id: I78ec78d22e2930a03b349a47ab3a3ad077277c42
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from commit 10830e844683c75d96c024450b4b7a624d8d6d8f)
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We have discovered that the active object ConnectionStarter could
potentially leave after deleteing itself in RunL. If that were to
happen, QtRRActiveScheduler::RunMarkedIfReady would have crashed when
it asked the deleted active object to handle the error.
Some active object deletion detection has been added to
QtRRActiveScheduler::RunMarkedIfReady to protect against crashes.
The ConnectionStarter active object has been modified so that even if
it does leave, when running in CActiveScheduler, it still won't cause
a crash and will clean itself up correctly.
Task-number: ou1cimx1#979241
Change-Id: Iafa10b96bbd8bedfec82d6d546c7ffaf0557fd8b
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QtRRActiveScheduler::RunMarkedIfReady was setting a flag in active
objects after RunL(). Active objects potentially delete themselves in
RunL(), and so this flag setting potentially corrupts memory. The flag
is unnecessary, so has been removed. Other flags are renamed to make
their roles clearer.
Task-number: ou1cimx1#947013
Change-Id: I1391c31b33074ee9d7fd02410fdb879afc455842
Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
Reviewed-by: Murray Read <ext-murray.2.read@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This fixes a Windows timer performance regression caused by
74251fb0fc57b1e0f7db0b561e4aa4c0347f6f37. This regression causes a
degradation in timer precision which can cause animations to not be as
smooth as well as negatively impact timing sensitive code.
Change-Id: I2821fde66799a5b1e9994e823a7dc56c91148742
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
|
|
|
|
|
| |
Change-Id: I163f510f6e99d86a35cc78965fa383e7f4618f42
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There have been a number of app crashes where deleteLater has been
triggering too early, causing an object to be deleted before it has
been finished with. This was happening when deleteLater was issued
then Symbian's active scheduler loop was nested. Qt keeps track of
loop nesting level to implement deleteLater correctly, but it was
only tracking the event loop in processEvents and QEventLoop correctly.
The wakeup and timer active objects were assuming they were always
run from processEvents and its round robin active scheduler and were
adjusting the loop level to account for this. However if they happened
to run in another event loop, eg the active scheduler, the loop level
adjustment meant that it looked like the event loop was re-running at
the same level, which allowed deleteLater to act.
The fix is to mark active objects as being run from the RR scheduler,
then the wakeup and timer active objects can be tested to see which
type of scheduler they are actually running in. With this knowledge,
the correct loop level adjustment can be made, and deleteLater runs
at the correct time.
Task-number: ou1cimx1#947013
Change-Id: Id05cd63ad10e100ea807cc276844aaa36c614351
Reviewed-by: Gareth Stockwell <ext-gareth.stockwell@nokia.com>
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Timers are thread local objects on Symbian. When the adopted thread
monitor tries to tidy up a thread, any existing qt timers will be
cleaned up. But that has to be done very carefully without touching the
underlying symbian timer objects.
Checks are added to make sure the Symbian timers are only touched in
the correct thread.
Task-number: ou1cimx1#960478
Change-Id: If16750b455aa576aa9f2d93657a3627d18060272
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
WEC7 does not have std::floor, define it in qfunctions_wince.h
and include qfunctions_wince.h to qmldbg_inspector in WinCE environments.
Task-number: QTBUG-22510
Change-Id: I801d908bf1a70203619e3af9262d7ffcb8ccb1bb
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-22512
Change-Id: I17fd0ff83fa23ae3e17597b753819d1f6b5d8446
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-12389
Task-number: QTBUG-16667
Task-number: QTBUG-6151
Task-number: QTBUG-8625
Task-number: QTBUG-19808
Task-number: QTBUG-12096
Task-number: QTBUG-1231
Task-number: QTBUG-21073
Task-number: QTBUG-8939
Task-number: QTBUG-20399
Task-number: QTBUG-20944
Task-number: QTBUG-7542
Task-number: QTBUG-22095
Task-number: QTBUG-11278
Task-number: QTBUG-15653
Change-Id: Ibc369998d06e7f2f11b01a1ba4c2fb927e3c065b
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Windows CE does not have strerror(_r), so lets use string formatting
provided by windowsErrorString function.
In order to use windowsErrorString it was moved before
standardLibraryErrorString function.
Task-number: QTBUG-22498
Change-Id: Ifa20c4ac314ac8a26de6b0c5b67ced96b262c2b4
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
(cherry picked from commit 106bab644a5d55f136d223fadc1440e07cd41872)
|
|
|
|
|
|
|
|
|
|
|
|
| |
The Symbian event dispatcher handles exceptions from active objects
as well as leaves. But if the active object throws while it has
something pushed on the cleanup stack, the exception must be converted
to a leave for the cleanup to happen and the cleanup stack balance to
be maintained.
Task-number: ou1cimx1#970701
Change-Id: I6c8eed61cb1666e36eb4858a2c72ad0d8c6b0c8f
Reviewed-by: Shane Kearns <ext-shane.2.kearns@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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
When WLAN and 3G connections are both active, the proxy for the wrong
connection may have been chosen in the case of plain sockets or
QNetworkAccessManager with an invalid configuration.
When enumarating active connections to choose a proxy, prefer a connection
that was opened by this process.
Task-number: QTBUG-22615
Task-number: ou1cimx1#930701
Reviewed-by: mread
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|/
|
|
|
| |
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Task-number: QTBUG-22847
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
tests: allow unstable tests to be marked with CONFIG+=insignificant_test
Fix focusScopeItemChange setting crash
Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd
symbian - handle path being passed as part of filename in QTranslator
Symbian - fix compile error when default configured
Compile when -no-rtti is specified as a configure option
Ensure that the RC_FILE is correctly handled in a single configuration
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Although incorrect API usage, this was a regression from 4.7.3 behaviour
Task-number: QTBUG-22489
Reviewed-by: mread
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Fix memory leak in QCursorData
Create cleanup stack in idleDetectorThread
|
| |\ \ \ |
|
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This is to fix a crash problem in idleDetectorThread.
idleDetectorThread implementation may use cleanup stack.
The culprit is QSysInfo::symbianVersion, which is called in QMutex
implementation. The first call of QSysInfo::symbianVersion
uses functions with cleanup stack usage. Later calls use cached
version info and do not need cleanup stack. Without this fix, if
idleDetectorThread starts before version information is cached,
a crash happens.
Reviewed-by: mread
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
WINSCW def file update so that qtgui can pick up virtual from qtcore
Add mobile-reduced ts-files for Symbian.
Preventing zero-timer lockups when Symbian's active scheduler used
Fix memory leak in S60Style
Improve whatlog generation for Symbian tools2 builds.
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Qt 4.7 had a deferred active object scheme to give Qt active objects
some round robin behaviour with Symbian's active scheduler. Qt 4.8
has a round robin active scheduler which removed the need for any
special support in Qt's active objects. Except it has been discovered
that sometimes Symbian's active scheduler is used, and if
Qt's zero-timer active objects are running at the time, they can
prevent any other active objects from running in Symbian's scheduler,
which can cause lockups.
This change re-introduces the deferred active object system for Qt
timer active objects. This means that a timer active object will only
run once per processEvents() call when Symbian's active scheduler is
used. Qt's round robin active scheduler already prevents an
active object running more than once per processEvents(), so this
change does not affect the normal case of using Qt's round robin
scheduler.
Task-number: QTTH-1494
Reviewed-by: Shane Kearns
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Missing icon in the designer documentation
Fridge magnet example code snippet error
qpaintdevice-qt3.html documentation errors
QWebElement example missed information
QSPlitter style-sheet example was invalid
Errors in QSqlDriver::handle examples
QGLColormap example was invalid
QPointer made no mention of QWeakPointer
Invalid links to http://developer.symbian.org
QNetworkDiskCache documentation missed information
QStyleSheet example used a property that is hidden.
QList document referenced to non existing function
QXmlQuery::bindVariable documentation bug
Fix multiple typos in QLineF documentation.
Qmake project file docs lacked information.
Documentation error in SSL document
Fix multiple typos in documentation.
Fix for QVector::toList - code example documentation.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QPointer didn't mention QWeakPointer although those are
"related" to each other. Added link to "see also" section.
Task-number: QTBUG-20721
Merge-request: 2698
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Symbian configuration parameter change for linux building
Improve patch_capabilities script output.
Fix QtSql autotest server addresses
Update SQLite version number in legal document
Update SQLite version mentioned in licence document
Symbian Linuxification building case changes
Fix FTP example to handle failure to open network session
Use QBasicAtomicInt as a static variable
FTP - fix interoperability issues with SIZE command
QS60StyleAnimation exception safety
Catch potential throw in ~QSymbianControl
Fixed access to null threadData in ~QObjectPrivate
Fix the build for makefile build system of Symbian
Symbian - fix compile error when default configured
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If a class derived from QObjectPrivate throws an exception in its
constructor, ~QObjectPrivate will be invoked with threadData being
null. This change tests for null before accessing threadData.
Task-number: QTBUG-4871 incidental finding
Reviewed-by: Shane Kearns
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Doc: Fix example code
Regression caused by 2be143ebb5246bb2f9b674bb09d23df5b2b6c504
Accepting predicted text using hardware keyboard replaces unwanted part
Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4
Workaround to VideoCore III scissor bug.
Fix to QGLWidget crash
Update def files
Fix crash on exit when overriding signal handlers in states.
Typo fix
Add new signals to indicate GPU resource usage.
symbian - search drives for translation files
symbian - search drives for translation files
Cannot flick to the end of a horizontal list view width LayoutMirroring
Backport more imports directory caching changes.
Symbian - fix deleteLater not working from RunL
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
|
| |\ \ \
| | |/ /
| |/| /
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Qt may be installed on a different drive from the application,
particularly the case when Qt is included in ROM (Z:) and the
application is on C:
With this change, if QTranslator::load() specifies an absolute
directory in the filesystem (e.g. "/resource/qt/translations") without
a drive letter, then the symbian search paths are used.
Note that this example path is the one returned by QLibraryInfo so
applications using the example code from
http://doc.qt.nokia.com/latest/internationalization.html#produce-translations
will work as expected.
Task-number: QT-5246
Reviewed-by: mread
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
deleteLater stores the loop level in the deferred delete event to
prevent the object being deleted by a nested event loop.
However as symbian active object RunL functions are called directly
from the active scheduler, the loop level is incorrect at that point.
(It is normally set by QCoreApplication::notifyInternal)
To solve this, the loop level is adjusted before calling RunIfReady
so that it is correct during RunL functions. It is then adjusted back
for the specific active objects in the event dispatcher that call
into QCoreApplication - sendPostedEvents, sendEvent.
Task-number: QTBUG-21928
Reviewed-by: mread
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
|\ \ \
| |/ / |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Working directory (as opposed to applicationDirPath) was
on the Z drive before, change it to be the same.
Task-Number: QTBUG-22024
Reviewed-By: mread
|
|\ \ \
| |/ / |
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Library paths on Symbian can change as memory cards are inserted or
removed. Potentially there is a \resource\qt\plugins on a card which
should be added to the library path.
Since some Symbian Qt applications are expected to be very long running,
they would not see an updated library path without this abililty to
update the path.
The update algorithm strips out existing instances of
\resource\qt\plugins, places new ones where the first
\resource\qt\plugins was, and leaves the rest of the library path
unchanged.
Task-number: QTBUG-20098
Reviewed-by: Shane Kearns
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When using Qt 4.6 and 4.7, the working directory is set to the same
drive the application is installed on by the open c library.
The default working directory in symbian is always the private
directory on the system drive, but we told people to rely on the
open c behaviour.
Open C also creates the private path on both the system and
installation drives when the application is started.
This behaviour is also replicated now in Qt 4.8 for backward
compatibility of apps that may rely on it.
Similar code to create the private path on the installation drive
in QCoreApplication::applicationDirPath() has been removed, as the
new code in this patch is always executed first.
Task-Number: QTBUG-21527
Reviewed-By: mread
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
according to Thiago, setting the pointer with the same values *is* thread-safe
Merge-request: 2655
Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
the initialization guard must be set after the initialization is done;
for the code assumed to be only executed in a single thread, this change was done
just for consistency - in order to avoid similar issues by copy-pasting in future
Merge-request: 2655
Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
|
| |/ /
|/| |
| | |
| | |
| | | |
Merge-request: 2655
Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
|
|\ \ \
| |/ / |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The lack of cleanup stack caused panic when the global static QSettings
instance in QCoreApplication was deleted if there was pending update
in the QSettings instance.
Task-number: QTBUG-21421
Reviewed-by: Murray Read
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-15631
Merge-request: 1402
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
Change-Id: Idf2f725dd859aa5c960e5889678cac0e139e44b0
Reviewed-on: http://codereview.qt-project.org/5475
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit d5ad900c77af563a1f3cfb0d252fd173249493fb)
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix build for desktop
Fix the build with -qtnamespace configure options
|
| | |
| | |
| | |
| | |
| | | |
Merge-Request: 1291
Reviewed-by: Liang Qi <liang.qi@nokia.com>
|
|/ /
| |
| |
| |
| | |
Task-number: QTBUG-14067
Reviewed-by: David Boddie
|