| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
The following line should be used instead
## Contact: http://www.qt-project.org/
Change-Id: I75479b017a76872640043920811066d4a0605a10
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
|
|
|
| |
The test had one stable failure which should be fixed
by adding missing QT_MODULE and QT_BEGIN_NAMESPACE macros
Change-Id: I10801e4c495bee66e1937a57d14019dae8b43a9d
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Since objects in the scope chain have to be JSActivationObjects,
QScriptContext::setActivationObject() creates a proxy object that
should delegate access to the actual object.
This case was not handled in the toQObject() conversion function, so
for activation property access through evaluation (where the
this-object would be the proxy object, not the actual QObject), the
this-object conversion to QObject would fail, and the assert
"this-object must be a QObject" was triggered.
Cherry-picked from qt5/qtscript commit
44062ea8e2499f8d2061c7e5be8fb754f2ba4310
Task-number: QTBUG-21760
Change-Id: I284b70ea5c9af3a15dadd4243283afe0d00bcd5a
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
|
|
|
|
| |
The test has one stable failure. Mark this with QEXPECT_FAIL and
re-enable the test.
Task-number: QTBUG-26726
Change-Id: I7b59609f71d35af27b56f62eedc9bbef4adb7f65
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
|
|
|
|
|
|
|
|
|
| |
This is a temporary solution to enable the license header test.
All license headers need to be converted following Qt5
Change-Id: Ic96c0fd783aedc4aa4fefaa4eb816e75cd07f742
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
It only fails on Mac OS X Lion. So remove the insignificant flag and
set it be expected to fail only on Mac OS X Lion for two test cases.
Change-Id: I61a53ae342d6769a76394acaca2581d0b0fd060a
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If the drag.axis is changed while a drag operation is in progress, put
it into action immediately. This allows, for example, start a dragging
operation out of an item in a scrollable ListView to anywhere on the
screen.
See the linked bug number for an example.
Task-number: QTBUG-26440
Change-Id: I4ffa71c08b97a767aec7f69d19271000a2631327
Reviewed-by: Rick Stockton <rickstockton@reno-computerhelp.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Set the testcase QEXPECT_FAIL only if it is going to fail.
Waiting a fix for QTBUG-26514.
Change-Id: I05017a347039c0fba4ba41d22d91d056dd4e908c
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
|
|
|
|
|
|
|
| |
precision issues
Change-Id: Ib667dc79072e900f200943f05fb3db9512f4282e
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
|
|
|
|
|
|
|
|
|
| |
This test crashes so skipping it with QSKIP and re-enable
the test.
Task-number: QTBUG-26594
Change-Id: I8a22313b59bbe227ef0d7489fe344734c02ad970
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
| |
Reported-by: Marc Mutz <marc.mutz@kdab.com>
Change-Id: If53957bafa9c077981c8ec5107313bc25469b579
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The floating point problem which causes this test to fail is not
triggered if Qt is compiled in debug mode. Enable QEXPECT_FAIL more
narrowly.
Task-number: QTBUG-20661
Change-Id: I25f3260b516cd4fda9d8b711aa1140cbda821412
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
(cherry picked from commit 5d481fa2400b08bd11aae364e4f31ccc7a8e909c)
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
| |
Change-Id: Idab511868f3e90d1db95541b16dc0eb18a900a04
Reviewed-by: Albert Astals Cid <albert.astals@canonical.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This autotest failure is stable, so it should be marked with
QEXPECT_FAIL, not CONFIG+=insignificant_test.
Note that the test row naming had to be changed, as the test previously
created many rows of testdata with the same name, making it impossible
to skip only the broken rows.
Task-number: QTBUG-20661
Change-Id: Ie38f5dddafe7686e30eaa8ff3445310935d2cd9a
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
(cherry picked from commit 95d9a0c25c207c7dfc5fa228e90a2eb873b2ecbc)
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
| |
The test has one stable failure. Mark this with QEXPECT_FAIL and
re-enable the test.
Task-number: QTBUG-26514
Change-Id: I6faeda44224f2010ed836425a787269bfe483168
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
tst_qfilesystemmodel::sort uses some internal API to affect the sorting
behavior. This means that part of the test must be disabled when
private symbols aren't available.
Change-Id: I2e7b9d7a33cb3e7032bc5380c03fa29ecc84e12c
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
(cherry picked from commit 4e84be2876543c1bfcab3b854c92a7edade4144b)
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
These methods failed to respect the setting of the generated flag
on the fields of source record. INSERT and UPDATE statements should
only include fields where generated is TRUE.
Test included.
Follow-up to 0f15ab4e750690bdb2b649332d5c3276bf24c440.
Change-Id: I2f10dbcd7e5e5123489b38a123effe43a673a427
Task-number: QTBUG-23592
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Jason Dolan <jason.t.dolan@gmail.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When you're inserting a column in front of a rowspanned cell
and this cell is not the first in the rowspan, we would get
the wrong logical index of the new cell (putting it in
front of the initial cell with the rowspan). If the cell
does not span all rows, the table will get into a broken state
and trigger asserts in update(). To fix this, we search for
the first cell after the insertion point which has a logical
index higher than the cell directly before the insertion point.
Change-Id: Ic6fb66bc25ad91f3534886f964173ead924429e2
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
qglfunctions was previously skipped due missing OpenGL support on
Windows machines. After installing Mesa 3D OpenGL library the test
started to run, but it fails. Marking test to insignificant until
the issue is resolved.
Task-number: QTBUG-26390
Change-Id: I783132a33de4e4483ff074c0df7b977e02e7fc7a
Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Manually cherry picked from Qt5 SHA 85594bd9
Task-number: QTBUG-25563
Change-Id: I16131e33712702028843f0404b65ea9f7b04c7d5
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
|
|
|
|
|
|
|
|
|
| |
Prevent recursion in QMainWindowLayout::endSeparatorMove().
Task-number: QTBUG-21378
Change-Id: Ie40005a35918d4da7ef911f8c3b1d1c3b5cf4fd2
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Reverting changes from 1b031759ddfdab9703dfecac13f1ed318da3dafe except
for Mac
Task-number: QTCREATORBUG-7215
Change-Id: I8570c4bd35daf8b5820507a9399d33d00f96d41b
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
|
|
|
|
|
| |
Change-Id: Ie6fe917406ef402b077f7fa55a5fb4dfbbf4fbb5
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Set the working directory such that the binaries are found:
Mac: disable app-bundle
Windows: cd up if we are in a debug, release folder
- Suppress the debug/release folder for the wincmdline process,
make it a simple console app.
- Print proper message if process launch fails.
- Restrict insignification to qws/embedded due to an
exit crash. Expect-fail focus test on Mac.
Task-number: QTQAINFRA-428
Change-Id: I3aaa9c5faf97557717eaa84d343e5cb59f6a53e2
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
| |
- Use correct working directory.
Task-number: QTQAINFRA-428
Change-Id: I31fdc941fe21e2efa29d742a5b8cd89f2214e81c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
| |
Teach it to find this file in the SRCDIR.
Change-Id: I64e3926f10304efc15faa28b2b98569400802c59
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The standard streams can be redirected to a file, so don't assume
anything, but try to get the actual size and position from the OS and
from the C library (stdout is usually buffered, so the result of lseek
might be different from ftell).
(cherry-picked from qtbase commit ba7f664a7fbb5612126e5144e58240ab05968259)
Change-Id: Ice4a0aa21726671928f56a13cc07cc0e4b52091d
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
http://unicode.org/versions/corrigendum6.html:
> in Unicode 5.0, the list of characters with the Bidi_Mirrored property
> was made consistent for brackets and quotation marks, in preparation for
> new constraints on bidi mirroring. However, after publication of
> Unicode 5.0.0 it was discovered that this change adversely affected
> several quotation mark characters in deployed data.
Task-number: QTBUG-25169
Change-Id: I2cd6a70a69f4b2c37a3f191e05233854a16f10d1
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This is similar to 2509a5b5a49ea52948b434578ff29e7f9ba60b40 in
Qt 5 (qtbase). In 4.8, stdout also seems to be affected, whereas
in Qt 5, the problem occurred for stdin.
Task-number: QTQAINFRA-428
Change-Id: Ia644923bdb76d0ac3c218c843fefcf280ee729cb
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Locate the stdinprocess from the application
path.
- cd to SRCDIR such that the relative paths
always work.
- Introduce a NO_NETWORK_TEST defines making it
possible to run the tests without network
infrastructure.
Task-number: QTQAINFRA-428
Change-Id: Ib2514a4da0f9814f83ae1d7931614fd159968b0c
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Test deliverInDefinedOrder_QTBUG19637 was skipped in Symbian to avoid
crashing. Test crashed because object events could not be processed
in time in slower Symbian devices.
Added waiting for all events to be processed before checking actual
event count.
Task-Number: QTBUG-23974
Change-Id: Idd79d4ec9fe21a4f03f2d9ba2e365abbbc45c9d8
Reviewed-by: Murray Read <ext-murray.2.read@nokia.com>
Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
After 39f2c09d9154e00409c73c6f6db90a4ddb06b8f0,
Windows applications of type Gui/Tty (uic3) would emit many
"QPixmap: Cannot create a QPixmap when no GUI is being used"
when initializing the cursor cache, breaking the stderr
checking of the test.
Task-number: QTQAINFRA-428
Change-Id: Iac74fd7af905e462ac2063c58dfcd91a6b0759a7
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
|
|
| |
This test was fixed by 79a3efbd95f6df17dc1f922b469c67d86183c233
Change-Id: I4cd9f16d315de3c3f6777961ea3e682d4a1226bd
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In QTreeViewPrivate::adjustViewOptionsForIndex() wrong index had been
used when referencing to array of viewItems. Variable row is set to the
index of the QModelIndex, however it is not as same as the index in
viewItems[] when there was hidden item in treeWidget. Index of viewItems[]
should be used here. Unit test is added as well.
Change-Id: Ie129cb63445bf1239ef7c5b2bc61b04dd9e81982
Task-Id: QTBUG-25333
Backport of <3be6ca3ee8c2c72f85b26a57538fd329ed811261> from Qt5
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
There is a message check in QStatusBar::showMessage causing the call exits
early if the new 'message' is the same as the current message. The check
has been removed, and new timeout will always take effect. Unit test is
added as well.
Change-Id: Id3d6ed15104d4d40c1cd2c76444c30badc8b1b72
Task-Id: QTBUG-25492
Backport of <7381328bcc37283be97eedddc24c46be1e38490e> from Qt5
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Set the working directory such that the binaries are found:
Mac: disable app-bundle
Windows: cd up if we are in a debug, release folder
- Suppress the debug/release folder for the wincmdline process,
make it a simple console app.
- Print proper message if process launch fails.
Task-number: QTQAINFRA-428
Change-Id: Iaa730ade9f65240bc361bc49d409c51af1af42a9
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Don't overwrite the ignore value once it's been set to true. Backport
from Qt 5.0 to Qt 4.8
(commit a7017465152d544a4217d5ce4f6f84b80cb9b8b9)
Task-number: QTBUG-25447
Change-Id: I2232806b1235b0c901aab21116b5bc70c65d0500
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Right now, the parser crash when using id.variant.property for an alias.
The current patch fix the crash, and it displays an error message in
the console now (like QtQuick 2).
Task-number: QTBUG-25341
Change-Id: I5e2c13f487655fd2b90129c5693f5daf3f77984b
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Cherry-picked a70b8d407e1ca46e5dc208580534feee7ddfe51a from
Qt5's qtbase master branch.
Maintain the consistency of QWizardPrivate's two members:
QVector<QWizardField> fields;
QMap<QString, int> fieldIndexMap;
during and after calls to QWizardPrivate's
void _q_handleFieldObjectDestroyed(QObject *)
member function. The failure to maintain this consistency
caused an out of bounds access and core dump in
QWizard's field(const QString &name) member function.
QWizard's field(const QString &name) member function expects
the values in the QMap fieldIndexMap to be indexes into the
QVector fields. Prior to this change
_q_handleFieldObjectDestroyed only removed the appropriate
entry from the map and erased it from the vector. It did
not decrement by one all the indexes greater than the index
that was removed from the map and erased from the vector
in the rest of the map.
For example ...
So if initially have the following mapping ...
"field0" -> 0,
"field1" -> 1, and
"field2" -> 2
with fields of size 3. After destruction of "field1" have ...
"field0" -> 0, and
"field2" -> 2
with fields of size 2.
Now attempts to look up "field2" using QWizard::field will
have an out of bounds error and possibly core dump or trigger
an internal Qt assert because an attempt to access
this->fields[2] will be made. It should be accessing
this->fields[1], but does not because the map is no longer
consistent with the vector.
This change adds a decrement by one for all the indexes
greater than the index that was removed from the map and
erased from the vector.
Task-number: QTBUG-25691
Change-Id: Ia2a41027628a65faec4ecdd5da235ddd19746a57
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
The socket engines already implemented this, but it is a good idea
to test it explicitly.
Task-number: QTBUG-25634
Change-Id: Ife3fe09b0119ed435e4055523c553847739a09fe
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(back ported from commit e5f77fe31be0ea2c891eacd3e866bb9db4e0a238)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When the scope ID is not set, Mac and Windows will not transmit
packets to link local addresses. This patch implements setting
the scope in the native socket engines and adds a test case.
(it was partially implemented already, though UDP specific code
paths were missed in the unix engine)
Task-number: QTBUG-25634
Change-Id: I23300bdc9856e38458078e913daaa59cd05a74b5
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
(back ported from commit 6abc66e076826b24cc3700c3a0702f552ab50429)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fixes a crash when invoking various QRegExp methods on an object
*before* doing any match. For instance fixes:
QRegExp re;
re.matchedLength(); // crash
Backport of commit 136c2bf18446f2bbe7052d638c29edbc0b8ef6bc from qtbase.
Task-number: QTBUG-23352
Change-Id: I9c239ff790a139c7820ef1aeced89d31320ae6b0
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
A (probable) typo was causing the code dealing with anchors
to use uninitialized values. This used to work by chance, but was
indeed detected by Valgrind f.i. when running tst_qregexp --
the indexIn test on anc11 data reported:
==3015== Conditional jump or move depends on uninitialised value(s)
==3015== at 0x514B4EA: PeppeQt::QRegExpMatchState::testAnchor(int, int, int const*) (qregexp.cpp:1813)
[...]
==3015== Uninitialised value was created by a stack allocation
==3015== at 0x514B3EB: PeppeQt::QRegExpMatchState::testAnchor(int, int, int const*) (qregexp.cpp:1803)
Fixing the code also makes the aforementioned test to succeed,
therefore the #if 0 sections can be droppped.
Backport of commits 281771ee201e591d4f40a161b93c71914b1b38f2
and 1fe7e557d75962c9c79cc344037a02ed50369430 from qtbase.
Change-Id: I4d6cffdae737def1a47e72b46e40979e0aee1719
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When a file is specified on a path that includes a drive letter
followed by a colon but no slash then it didn't always account
for the fact that this refers to the current path on that drive.
This fixes the problems in completeBaseName(), baseName() and
path(). Tests are also added for these three cases and some
others too.
Task-number: QTBUG-25353
Change-Id: I47a197c6af066f532442ad269be57597ec61303a
Reviewed-by: Irfan Omair <irfan.omair@gmail.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
(cherry picked from commit cfb44c6528b2518274bf157388832d1d610ce0e4)
|
|
|
|
|
|
|
|
|
|
|
|
| |
No shaping rectangles means no interaction with the window
The shaping rectangles are based on the window coords, so need to substract the window coords when checking for the point
And some tests to prove this change is needed
Backport from commit 07f3c1e26aa6dcd07a9705e7b2ea02ace9ea7c5d from qtbase
Change-Id: I6dd6c75c2bd70463561445b4f4a3894c80981d26
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
an unassigned code point should be treated like a starter code point;
thus, if we have met an unassigned code point in the currently processed
sequence, we should start process the next one (but we know there are
no composed character for an unassigned starter -> simply skip it)
This patch doesn't apply to qtbase, commit 46b78113b22428e6f8540193fcf0e00591dbd724
solved the same issue in a different way.
Change-Id: I781a26024878d8b83a182b0fd4e681be2a6d9a27
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
A disabled Flickable should not filter children.
This is a backport of change I9f0d8fbfd0922b5c6a9eaffa69212867359f79e0,
from Qt5 (later discarded in QtQuick1 restructuring of Qt5).
Task-number: QTBUG-20584
Change-Id: Id279907ee90faf19284c12b548467850662a7019
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
The pro file has a missing colon in the last line regarding help.pro.
Although the intent was to exclude it from symbian compilation, the
missing colon caused that it was dropped from all platforms. This
fix will bring it back, while still excluding it from symbian.
Change-Id: I3cf05505d969182556458272cf10bc8847476468
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
I wrote nonsense in that commit. The older methods that take a timeout
all take milliseconds, and the comments in the unit test really meant
milliseconds, not seconds. 1s is not shorter than 100ms....
Backport of 972464262166752df0015fe1209a7ab307cc7105
Change-Id: I3539cf196848b483b8c3a96b45851a465fc2dfcb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|