| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Reviewed-by: Gabriel
Task-number: QTBUG-15910
|
|
|
|
| |
Reviewed-by: Sergio Ahumada
|
|
|
|
|
|
|
|
| |
Added some better unit testing around the problem areas.
Change-Id: Ie4749da298aebbae6aec9558ebe8c8f2196c705f
Task-number: QTBUG-14916
Reviewed-by: Charles Yin
|
|
|
|
|
|
|
|
|
| |
Since the change is immediately visible through data(), this is needed
so that QSortFilterProxyModel etc work correctly.
Change-Id: Ied7afce2e6a1f516b502d3501f9d214df54e52f2
Task-number: QTBUG-14831
Reviewed-by: Charles Yin
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
After inserting a column, fetching data through QSqlTableModel was
off by one or more, since it passed the indexInQuery through to
QSQM. Also, the headerData would sometimes return a blank string
for an inserted column, and sometimes the column number.
The autotests have been beefed up a little to check insertRows and
insertColumns play nicely.
Change-Id: I7399d4c4d94f958884b67ab9b39b5cf2485d8416
Task-number: QTBUG-12626
Reviewed-by: Charles Yin
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
in the unix code, if the QMutexPrivate::wait() with a timeout
expires in the same moment that the mutex is released, wakeup
would be set, but would be then ignored. (reset to false
quickly after)
If we waken up between the timeout and the re-aquisition of
the internal mutex, we consider that the mutex has been locked.
Reviewed-by: brad
Task-number: QTBUG-16115
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 2e72a8b19ea6c674fb4777860dac50faa5d387e6.
The behavour in Qt 4.6 was wrong. And even if it was not documented,
it is too late to change the behaviour back at this point.
The tests for QEventLoop and QCoreApplication have not been reverted
Reviewed-by: Brad
|
|
|
|
| |
Reviewed-by: ossi
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix potential networking crash due to null-pointer dereference
Revert "Improve timer ID safety by using a serial counter per ID."
Invalidate QScriptPrograms when engine is destroyed
Fix alignment issue causing crash in QtScript/JavaScriptCore
Restore Qt 4.6 behaviour: exec() always enters the event loop.
Make syncqt not complain about missing header macros.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In Qt 4.6 as well as 4.7's QCoreApplication and QEventLoop, calling
exec() always enters the event loop, even if you had tried to
quit()/exit() it before entering, with one exception (noted in the
unit tests; this difference has been in Qt since at least Qt 4.2).
Add unit tests to ensure all of the three classes have the same
behaviour.
Decide if we want to match the behaviours in Qt 4.8.
Reviewed-by: Bradley T. Hughes
|
|/
|
|
| |
Reviewed-by: TRUSTME
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap
Revert "QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap"
add autotest for digest authentication
QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap
Improved performance of mapFromGlobal/mapToGlobal on X11
Moved the implementation of mapFromGlobal/mapToGlobal to QWidgetPrivate
|
| |
| |
| |
| |
| | |
Reviewed-by: Markus Goetz
Task-number: QTBUG-15070
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
| |
Commit 0ba1b4d0 introduced a regression to QTextDocument: it postponed
cursor position adjustment until the move operation is done, but
contentsChanged will be triggered by finishEdit() in this move
operation, thus cursor positions in this signal handler will be in
inconsistent states (normally we should first update cursor position
then trigger contentsChanged). In this case we should also postpone
finishEdit() handling after cursor positions have been adjusted, then
the states expose to applications will be consistent.
Task-number: QTBUG-15857
Reviewed-by: Eskil
|
|
|
|
|
|
|
| |
don't say we passed the test if we didn't
Merge-request: 1018
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
|
| |
we locked shm few line ago and didn't unlock it, so we expecting for this warning
Merge-request: 1018
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
| |
Task-number: QTBUG-16769
Reviewed-by: Bea Lam
|
|
|
|
|
|
|
|
|
| |
We positioned the view beyond the bounds, which in some cases resulted
in only one item being created. Combined with a bug in the bounds
fixup very many items were created.
Task-number: QT-4441
Reviewed-by: Michael Brasser
|
|
|
|
|
|
|
|
|
| |
This reverts commit 82ff3f484c7ec49e60b7fddf23794937974a6768.
QTBUG-16796 reports that this commit is causing regressions
relating to initial sizing of items.
Task-number: QTBUG-16796
|
|\
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Use SRCDIR as a base path for the test data.
Add the test data to the INSTALLS target
|
| |
| |
| |
| |
| |
| |
| |
| | |
The test cannot run on harmattan CI system, which executes it from
a different directory than the one where the executable resides.
Reviewed-by: Adrian Constantin
Reviewed-by: Harald Fernengel
|
| |
| |
| |
| | |
Reviewed-by: Lucian Varlan
|
|\ \
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Cleanup created views in TextEdit tests.
TextEdit implicit size varied depending upon wrapMode.
|
| | |
| | |
| | |
| | | |
Reviewed-by: Michael Brasser
|
|\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Supporting Qt application fonts on Symbian
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This patch finally implements the missing application font support on
Symbian. QFontDatabase's addApplicationFont[FromData],
applicationFontFamilies and removeApplicationFont are now functional and
allow an application to load, use and unload fonts at run-time.
The underlying Symbian API comes with some restrictions/specialties.
Most of them are worked around in this patch, the missing ones are left
as part of QTBUG-16514:
- The font file must be a file, not a memory buffer. Web fonts and qrc
fonts come as memory buffers. These buffers are saved to a temporary
.ttf file and the file is loaded by the underlying Symbian API. The
temporary file can only be deleted after the font is unloaded.
- The font file must be in a public location in order to be loadable by
Symbian. It can for example not reside in the private application
directory. Therefore, all application fonts (also those that are on the
file system) become a temporary .ttf file in c:\temp\.
- Symbian3/PR2 will come with a font table API which provides direct
access to font tables. Symbian3/PR1 and below are missing this API,
therefore, an own TFontStore is (ab)used to read font tables out of a
font. This patch is considering both code paths in several occasions,
making the Qt Symbian font implementation significantly less
maintainable.
- The fonts are loaded into Symbian's central font server. Loaded fonts
from different processes can have colliding font typeface names (not
file names) on that server. The server does not separate loaded fonts by
their origin processes. Working around such collisions is part of
QTBUG-16514.
The number of fonts loadable at the same time by a Qt application is
limited to the random value 5. Just to prevent abuse of the font
server's memory.
As usual, this patch was looked at by colleagues, and it was adjusted
according to the feedback. But since the bus factor for the
interaction of Qt's and Symbian's font systems is 1, I reviewed this
patch, myself.
Task-Number: QTBUG-6611
Autotest: tst_QFontDatabase::addAppFont
|
|/
|
|
|
|
|
|
|
|
| |
on a systems with small packet windows, QProcess::readAllStandardError()
might return a part of the string and the existing code
adds an endl to it a bit later, causing a test failure.
(I don't care about the '\r'-s here because of QString shall eat them anyways)
Merge-request: 2546
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Revert "Add a warning about trying to release a timer ID that isn't active"
Some unit tests for layout explosion thingy
Fix a bug that got revealed by 604c51f1fc5c79b7fad12cda911b06b9e6e5005f
Build failure fix (related to QT-4079)
QWidgets support for VGA screen
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | | |
Adds more tests for commit 7fbf1829e11504eca6a55f1e5dbddf2f658b5302
Task-number: QTBUG-13551
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The bug has been around for a while, but change 604c51f1fc5c7 made it
emerge.
The problem was that stretches were combined by always *maxing* them.
The values of 'stretch' can be interpreted as this:
-1: (the default) it means that the items should be stretched with
the stretch factor dervived from the size hints. (In practice this
means that they are distributed fairly).
0: Means that the item should not be stretched
>0: Means that the item should be stretch with that number as a factor.
This meant that combining one item with a fixed size(0) and another
item with a default stretch (-1) the combined row stretch would end
up being fixed.
This also fixes how stretches are combined for spanning items too.
Task-number: QTBUG-13551
Reviewed-by: John Tapsell
|
|/ / |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Autotest for QVariant value types
Fix memory leak
Clarify Component.createObject(null) behavior.
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix system proxy test: QNetworkProxyFactory::systemProxyForQuery() is static
QNetworkProxyFactory::systemProxyForQuery() for Symbian
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The test failed to build because QNetworkProxyFactory can't be instantiated
(pure virtual member queryProxy()), but doing so isn't necessary. The test
has also been removed from the network tests because it relies on a static
configuration, but can not guarantee that the configuration exists.
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QNetworkProxyFactory::systemProxyForQuery() for Symbian
|
| | | | |
|
|\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix QSharedMemory and QSystemSemaphore autotests for Symbian
Fix QSystemSemaphore handle management issues in Symbian
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Janne Koskinen
|
|\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix doc typo
Document centerIn and fill in the anchors docs
Document level of support for QGraphicsObject properties
Add an autotest for QVariant method params
Don't crash Qt Creator when debugging an object alias
Consistent Docs
|
| |/ / |
|
| | |
| | |
| | |
| | | |
Reviewed-by: Ruth Sadler
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Use less GPU memory to make tests pass and skip
threaded rendering since eventually tries to access
main RWindow from secondary thread, which is not allowed
on Symbian
Task-number: QTBUG-13525
Reviewed-by: TRUSTME
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The Phonon API does not provide any way for the client to specify
which network connection should be used for streaming playback.
If the application already has a connection open, using a bearer
other than the default (e.g. using WiFi when the device default is
GPRS), it may be desirable to use it for streaming, rather than
allowing the Phonon backend to open a second connection on the
default bearer.
This patch adds a custom property on the Phonon::MediaObject,
called InternetAccessPointName. The client can specify the IAP
which Phonon should use by setting this property.
Note that support for this property is only provided in the Phonon
MMF backend.
Task-number: QTBUG-11436
Reviewed-by: Gareth Stockwell
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Update QTextOdfWriter test case to match actual (correct) output
|