| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-13362
Task-number: QTBUG-18356
Task-number: QTBUG-18417
Task-number: QTBUG-18664
Task-number: QTBUG-21562
Task-number: QTBUG-22094
Task-number: QTBUG-18741
Task-number: QTBUG-15921
Task-number: QTBUG-22172
Task-number: QTBUG-15738
Change-Id: I1d383a22612cd4fbcb7e03751e76409ca57fe7a2
Reviewed-by: Casper van Donderen <casper.vandonderen@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>
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-22504
Change-Id: I4a88a76f208e7040ff941651973591d30bff30d6
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
|
|
|
|
| |
ALLQTPLUGINS value had extra space in qt.prf, making graphicssystem
plugins not have correct path when specified in DEPLOYMENT_PLUGIN.
Task-number: QTBUG-23963
Change-Id: I67a36fa7fafd7ed0960e197fe3401fc6dd779578
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
| |
Changes some missing exports to absent in def-files to fix build break.
Change-Id: I2737dd9f2f636f02a3a7645a4a3a184667e8b572
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
WEC7 is missing some time conversion related functions ->
configured libpng for WinCE accordingly.
Task-number: QTBUG-22506
Change-Id: I209b143604bd70368cff7f811b33db8f00d18ed4
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: aavit <qt_aavit@ovi.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QEventDispatcherQPA::processEvents() calls
QEventDispatcherUNIX::processEvents() twice in a row. Before the first call,
it processes gui, posted events, input events and so on. It then calls
QEventDispatcherUNIX::processEvents(), which will eventually drain the
thread_pipe. If events are added by a second thread to the event queue, right
after select() returns but before the thread_pipe is drained, once the program
enters the second call to QEventDispatcherUNIX::processEvent(), select() will
block, because the thread_pipe is empty, but the events will be stalled on the
queue until something else causes select to return, because they are not
handled between these two calls.
Change-Id: Ie9a74573559feff6480b630abc237a8e5c89484b
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
|
|
|
|
|
|
| |
Change-Id: I206fbb5e137676bb56d251870928826876dc2bb2
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-22501
Change-Id: Ica63ad7de763d9abeff7f8e76ad45f90f04db75b
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@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)
|
|
|
|
|
|
|
|
|
| |
Checking for elements to not NULL.
If the shape is QVectorPath::RectangleHint calling fillRect and not
falling to RASTERCALLBACK. QTBUG #23850
Change-Id: I402da6074a1c7a9b1d026efe5d1b068e4aea8805
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Windows CE does not declare the localtime function, for this reason
sqlite3.c defines it for Windows CE. However the localtime define
was too late in sqlite.c code since the osLocaltime function
introduced inside ifndef SQLITE_OMIT_LOCALTIME needs it also.
Task-number: QTBUG-22508
Change-Id: I97b9bc6316809178cbcf7e304c5dcd7deb9005cb
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
(cherry picked from commit 1135aeb1d89b802ab3e3b7cc2c32122e9b91770f)
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-22496
Change-Id: I502e654de7e03fbdbd22b609698d238f90d129a9
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit 2f20d5f23ac9fd838aff19c3139769bafa476fd8)
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-22500
Change-Id: If530799cf8ef971f5caf78d0c6dbeeda719d148f
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit dd5e72e2da95e163254998094ec2a2fad9347c4b)
|
|
|
|
|
|
|
|
|
| |
The winx.h header is not needed to build qdesktopservices for WinCE, it
just addional dependency to one optional WinCE module and thus makes it
harder to build minimal WEC7 image for Qt purposes.
Change-Id: I592577b2af379b7b5d984e27b266b6581eb10e88
Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-18101
Task-number: QTBUG-8673
Task-number: QTBUG-14194
Task-number: QTBUG-9109
Task-number: QTBUG-9466
Task-number: QTBUG-8323
Task-number: QTBUG-7924
Task-number: QTBUG-20355
Task-number: QTBUG-19367
Task-number: QTBUG-21295
Task-number: QTBUG-14554
Task-number: QTBUG-8331
Task-number: QTBUG-8329
Task-number: QTBUG-8786
Task-number: QTBUG-8787
Change-Id: I4b6403df4a0078fa385abbfab5b6c3a94f175295
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
|
|
|
|
| |
mkspecs for QNX qcc, armv7le and x86 targets
cherry-picked from 43a48ad218fec43ef3c854cb4e215e7b372b23d4
Change-Id: Ic4bb8947aa4dd31a3ab6e23c36775f9c64d1443c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
WEC7 does not support FIND_FIRST_EX_LARGE_FETCH with FindFirstFileEx,
but windowsVersion for WEC7 is still resolved as WV_WINDOWS7.
If the FIND_FIRST_EX_LARGE_FETCH flag is passed to FindFirstFileEx
in WEC7, the method does never find any files from given directory.
Changed FIND_FIRST_EX_LARGE_FETCH flag to apply only when Q_OS_WINCE
is not defined.
Task-number: QTBUG-22503
Change-Id: Ic38cf745cda7ee7b23da67dc390ac0e6d04158cd
Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
(cherry picked from commit 55a5faadb5961c4c6a81de80c5cb3687da29d4de)
|
|
|
|
|
|
|
|
| |
Changes exports to absent in def-files to fix build break.
Change-Id: I0f0167c261911a23017042541d95855fcfd50cd9
Reviewed-by: Pauli Järvinen <ext-pauli.p.jarvinen@nokia.com>
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The original intention was to identify a clipping bug, it turns out
that during a ::begin() (and systemChanged) we should forward the
QPaintEnginePrivate state to our proxy engine.
Instead of using the proxy-pattern subclass rasterengine and
specialize the paths we are able to accelerate using the blitter
interface. This will avoid similiar problems in the future. I have
no performance measurement to show which of the two approaches is
faster/slower.
Change-Id: I5ee0de566f4568103f741af697bdabbb097927e4
Based-On: I39bff11b32b1fe20284c7e8df60050de5991bb6e
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
* Group code responsible for tracking the render pipeline state
to check if we can easily accelerate it
* Code that will call into the QBlittable
* Code that will lock the QBlittable before calling into raster
Change-Id: I759a1864967d92a4cdd48c29941cb20d36afd84f
Based-On: I862e242d59805de5094ed363b486afcdbc23ff78
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
A default QPainter will set a QBrush with Qt::NoBrush BrushStyle, the
current code detects this as a non solid fill and all calls with fillRect
and a color will not go through QBlittable. Check for Solid or NoBrush
style. Manually verified that a p.fillRect(rect, Qt::red) goes through
the accelerated path now.
Change-Id: Ie53abf0a7ba349ba70742a94086708aca0beaa37
Based-On: Ic0d98030e94f5d11abbe61628fbf71d1e08219c2
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Create updateCompleteState(QPainterState*) so we don't need to
call into the paintengine, move all state methods into the
QBlitterPaintEnginePrivate class.
Change-Id: Ia621aeb9dba98152503f14d8900cf57b5bf2d4f9
Based-On: If30fdcc3f63755e0443bced7d9d9fb993d4ec2b7
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Cosmetic change to remove four spaces of indention from some of the
more deeply nested methods.
Change-Id: I9f09a0ce65d74d6dab59a293bb7fb172a5e47aef
Baed-On: I67fdd0ab722b7c7c67c4da7a0a0bd86459751700
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
It starts with being initialized wrongly, the call to buffer() will
lock the data while we think it is not locked, it can also get out of
sync by someone calling buffer() again. Remove the variable and
check with the QBlittable if we need to lock the resource into memory.
Change-Id: I6d7b336ed2e272724ec5b1348b410cbc4452422f
Based-On: I350375011138d1b4c2c48c100b7b30b8ea2ae460
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Move the bit helper functions into CapabilitiesToStateMask as they
are only used in this class, allocate the class as part of the
QBlitterPaintEnginePrivate, shorten the name as well.
Change-Id: Ifab7905d7e240b7c9f08ac5e3421a632b6fe2249
Based-On: If22ddd117a9789cd98edb08f23fd0ffabb17d5a5
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
|
| |
Attempt to follow Qt style guidelines.
Change-Id: I53d3e93eab615e2b8b705698eb87a8d2636723ec
Based-On: I3298c8d41d40ab5b0153a33d44b1b607a2edca8e
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: I89d72b2b1c166b826d4367bcb1384c2c5263d5f4
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
The Symbian autotest tst_qmainexceptions has been upgraded to run on
hardware.
Task-number: ou1cimx1#970701
Change-Id: Ia96ebdafb92c986599032c59528ed8633e3bec6c
Reviewed-by: Murray Read <ext-murray.2.read@nokia.com>
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The rom upgrade flag allows the sis file to be installed if there is
already a version of the dll in rom.
The flag is silently ignored unless the sis file is properly signed
with a certificate trusted for this purpose.
This change saves developers needing to edit pkg files after running
qmake.
Change-Id: I0914734c951ea1f0d1c48b169bee0b022bc9e275
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The 'real' datatype should be seen as a QVariant::Double type and not as
a QVariant::String type otherwise it does not get presented correctly
when using a non Qt application to access it.
Test is included for QSqlQuery.
Task-number: QTBUG-16373
Change-Id: Ie323ce49eb95e4d6bb4c3814ba9a957a63f4b259
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
|
|
|
|
|
| |
Change-Id: I284199e0f0e77d28e1c72be1aaae1a9ac7c0f465
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|
|
|
|
|
|
|
| |
The test assumes that the "strings" command in the PATH is able to
handle target binaries, which fails. Just specify explicitly.
Change-Id: I8488cb8e71f47f564dfb1790c505e94b2d4a7def
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|
|
|
|
| |
Change-Id: I69ae8b40e3574039c8f9b0d88ecd55d16e830ac9
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Code added to catch C++ exceptions and Symbian leaves
inside QSymbianControl::Draw. This is a cosmetic fix
to remove CONE 6 crashes currently in Symbian port.
We'll still study the root cause of those crashes.
Task-number: ou1cimx1#952828
Change-Id: I7b62309dd205d3b5dbad3d5477b47451dd7ff397
Reviewed-by: Pauli Järvinen <ext-pauli.p.jarvinen@nokia.com>
Reviewed-by: Murray Read <ext-murray.2.read@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
extraction
QDBusArgument QByteArray extraction operator and QDBusDemarshaller that
implements the extraction do not check the type of the extracted value.
When extracting a QByteArray when the value actually is e.g. a struct of
mixed types the byte array extraction will crash as it attempts to extract
the struct data as a fixed array.
The fix adds DBus type checks to QDBusArgument byte array extraction
operator implementations.
The checks invalidate extracting arrays of other types than bytes to a
QByteArray that worked with the unchecked implementation. The rationale
for this restriction is
1) extracting a QByteArray to a variant checks already that the array
element type is byte
2) Results of extracting arrays of types wider than a byte to a QByteArray
are architecture-dependent making such code inherently non-portable.
Task-number: QTBUG-22840
Change-Id: Iaa284603c65d7a431a3fd020c18240cd8199ceb9
(From Qt5 commit b9acd85b2f92f887521b952f84ced9a2d1a8a57e)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QDBusArgument QStringList extraction operator and QDBusDemarshaller that
implements the extraction do not check the type of the extracted value.
When extracting a QStringList and the value actually is e.g. an array of
bytes the string list extraction will crash as it interprets the bytes as
char pointers.
The fix adds DBus type checks to QDBusArgument QStringList extraction
operator implementations.
The checks are as permissive as possible provided crashes are avoided.
Task-number: QTBUG-22840
Change-Id: I83a98097a7cf36f8448afba81d0ad619cdf864e3
(From Qt5 commit b4398dc4e372dbe829b21423e1a0a93a6a542994)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QDBusArgument string extraction operators and QDBusDemarshaller that
implements the extraction do not check the type of the extracted value.
When extracting string-like basic DBus type that actually is e.g. an
integer the string extraction will crash as it blindly attempts to use the
integer as a pointer to char.
The fix adds DBus type checks to QDBusArgument string type extraction
operator implementations.
The checks are as permissive as possible provided crashes are avoided.
Previously supported functionality of extracting an object path or type
signature to a string type is retained.
Task-number: QTBUG-22840
Change-Id: Ia27d4f4d461e5c4d3eac52f3cac85d6734f000b3
(From Qt5 commit 8f19f142745f3cb0690dcd51cebc66153e396805)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Commit e20eaed5c1968e32eca97cf449fa588cfab35a5d was merged to Qt 4.8
although the originating merge request
https://qt.gitorious.org/qt/qt/merge_requests/1469 targeted Qt 4.7.
This resulted in test data setup and execution failure for test case
tst_QDBusMarshall::demarshallPrimitives() due to changes in the test in
Qt 4.8.
This commit refactors the sendBasic_data() test data function to support
separate initialization of basic numeric and basic string data to be
reused by demarshallPrimitives_data().
Same refactoring was done in Qt5 and this commit aligns Qt4.8 commit
e20eaed5c1968e32eca97cf449fa588cfab35a5d with Qt5.
Change-Id: I10d0fce34c99c7b3b6247c503634b55a93f7d3b2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
| |
Change-Id: I47ecf04f538e094fe67110e627a5f17a34438df9
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This fixes the paper size setting on Mac as it would not return the
same paper size that was set with setPaperSize() when calling
paperSize().
Test is included.
Task-number: QTBUG-20882
Change-Id: Ib0064dd40de147d6db2424cdb31021e66894cc37
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
|
|
|
|
|
|
|
|
| |
SidCleanup struct must not be in the INCLUDE_NAMESPACE.
Change-Id: Ic51f1734af583c0ba7f715f7b27f314211e698c5
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
|
|
|
|
|
|
|
| |
Clean whitespaces and old comments on the file.
Change-Id: I34e4e6ccb2c2e4f5c3dcbbad2c0933cde8215f3f
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
|
|
|
|
|
| |
Change-Id: I3c50510ae9f995101d6e2c977c5138713389d71e
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
File system cached metadata can't be trusted when custom file engines
are in use, because the custom file engine may want to override the
metadata. (e.g. present an archive file as a directory)
Therefore, check if a file engine should be instantiated for each
result in QDirIterator. This is a fast check if no custom file engines
are registered.
When pushing a directory (using QDirIterator::SubDirectories) the
file engine needs to be instantiated also.
Task-number: QTBUG-23688
Task-number: ou1cimx1#965023
Change-Id: I0114c8df6258535553783a2486131c4194926649
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
|
|
|
|
|
|
|
|
|
| |
The location of included QML files in demos had changed at some point,
but the symbian specific QML deployment parts were not updated to
reflect the new locations, thus breaking compilation.
Change-Id: Id01a685ca1de75cf73d32170b9f404c6619da7f5
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
|
|
|
|
|
|
|
|
| |
Task-number: ou1cimx1yyy964181
Change-Id: I2f24d1d0f988bfe029e24fd29d59e6421301b670
Reviewed-by: Jani Hautakangas <jani.hautakangas@nokia.com>
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Due to unconditional waits this test always needed 120 seconds to pass.
Now we're using QTRY_VERIFY and make sure that we write the data before
the process got killed even in the cases 3 and 4.
Change-Id: I4718f2a4f3e53921716c639ae8041114234e9086
Reviewed-by: Bill King <bill.king@nokia.com>
|
|
|
|
|
| |
Change-Id: Iebdabb30c83d4712ad75ec62ce35b4afc382b613
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
|