| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Lancelot: bail out if rendering consistently fails
Minor optimization to lance/elot
Make it possible to test the new font hinting in lance[elot]
Fixes: The "test: too many arguments" error after every make
|
| | | |
|
| | | |
|
| | |
| |
| |
| |
| | |
A rudimentary test script is also included, showing the use of the new
parameter to the qps setFont command.
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
Fix typos in QSharedPointer documentation.
Remove test for compiler correctness
Refactor qpointer dereference tests
Prefer QCOMPARE to QVERIFY for comparisons.
Improve coverage of qpointer autotest
Add comments, eliminate duplication in qpointer autotest.
Remove redundant includes and functions from qpointer autotest.
Fix tst_XmlPatterns::xquerySupport() autotest
Update copyright year to 2011.
BM2: Little fix to make the `make check-trusted' to work on Linux and Windows.
|
| | |\ \ |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Unit tests are supposed to verify Qt, verifying the compiler is a
different task entirely.
Reviewed-by: Rohan McGovern
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The data method is just another way of dereferencing a QPointer, so test
it in the same place as the other dereference operators.
Reviewed-by: Rohan McGovern
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Rohan McGovern
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Coverage analysis revealed that the assignment test was not exercising
code that shortcuts assignment when assigning the value that is already
held.
Reviewed-by: Rohan McGovern
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Test destruction of guarded objects in the destruction test
function, rather than partly there and partly in the assignment
test.
Reviewed-by: Rohan McGovern
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Rohan McGovern
|
| | | | | |
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Cocoa: p1 bug fix: fix auto test regressions
Ensure shared network session deleted from correct thread
Revert "Remove SIGBUS emission from QNetworkSession destruction."
Image w/ PreserveAspectFit has its width changed once more than needed.
Cocoa: p1 bug fix: revert use of subWindowStacking
|
| | |\ \ \ \
| | |/ / /
| |/| | | |
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Cocoa: p1 bug fix: fix auto test regressions
Cocoa: p1 bug fix: revert use of subWindowStacking
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Ref: 32228c4f2b3419a35d1623377050ef72edf73c92
It seems that the change above broke some auto tests, which
revealed a true problem. When it comes to modal dialog, children
still needs to be stacked on top of modal parents, as they the
user cannot use the mouse to raise it. So rather than removing
subWindowStacking fully, we narrow it even further down to
only be used for children of modal dialogs. All in all, this
is close to removing it, but still us it for certain corner cases.
Task-number: QTBUG-11481
Reviewed-by: msorvig
|
| | | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Image w/ PreserveAspectFit has its width changed once more than needed.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Avoid an extra setImplicitWidth/setImplicitHeight on image load.
Change-Id: I8bec1c97244068000c7a7f5fb3e937f80f3b36f5
Task-number: QTBUG-18573
Reviewed-by: Michael Brasser
|
| |\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
fix QLocalSocket::isValid() on Windows
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This function always returned false, even if the socket was connected.
Task-number: QTBUG-18204
Reviewed-by: Martin Petersson
|
| |\ \ \ \ \ \ \
| | |/ / / / /
| |/| | | | /
| |_|_|_|_|/
|/| | | | |
| | | | | | |
Conflicts:
src/gui/text/qfontengine_mac.mm
tests/auto/qdiriterator/tst_qdiriterator.cpp
|
| | |\ \ \ \ \
| | | |/ / /
| | |/| | |
| | | | | |
| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Improve Flickable dynamics and allow platform specific tweaking.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Flickable's previous overshoot behavior was to continue past the
boundary without any additional friction (deceleration). It now
decelerates faster when overshooting.
On touch screens in particular, the last points when a touch point
is released are unreliable, resulting in sporadic flick velocities.
It also now allows the number of samples used for velocity calclations
to be tuned.
It is now easy to tune the Flickable behavior for different platforms.
Change-Id: I24142a50be1fde2f8877e359e30b8efcdd1f7d5c
Task-number: QTBUG-10894, QTBUG-16388, QTBUG-17830
Reviewed-by: Michael Brasser
|
| | |\ \ \ \ \
| | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix failing autotest
XmlListModel should allow types other than application/xml
Document using Behaviors with States.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Caused by 4391e2a1c35a53cc5f116926a1e5177e9ee4f51e
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Manually amend latin1 change
QGraphicsItem::ItemStops[ClickFocusProgration|FocusHandling] must not interfer with touch event propagation
suppress warnings about ASCII to QString conversion
take the user defined temp dir into account
Compilation break in MSVC2008 and MSVC2005
Remove useless LFLAGS
Add docs for QNetworkConfigurationManager's time-consuming constructor.
rebuild configure
fix configure.exe option -opengl desktop
use mkdir -p for mingw+sh
Ensure the right font is used for rendering text on Mac
QDirIterator returns hidden directories when it should only return files
Update Polish translations
L10n: Update German translations.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
interfer with touch event propagation
Both flags are only supposed to affect focus handling but not the regular touch
event propagation. In this case, touch begin events were not propagated to any
item beneath the one carrying those flags.
Merge-request: 2588
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
QSKIP requires two arguments in those compilers.
Continuation of the fix to QTBUG-15421.
Task-number: QTBUG-15421
Reviewed-by: Prasanth
|
| | | |\ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
In Qt 4.5.3 and earlier, creating a QDirIterator with QDir::Files |
QDir::Hidden (i.e. search for all files, including hidden files)
returned a list of all hidden and non-hidden files in a directory tree.
In Qt 4.6.0 and later the same filter causes QDirIterator to return a
list of all hidden and non-hidden files and all hidden directories. As
the user is asking only for files, clearly returning hidden directories
too is incorrect behaviour.
Similarly, when asking for QDir::Dirs | QDir::Hidden (i.e. all
directories, including hidden directories), hidden files are also
(wrongly) returned.
Task-number: QTBUG-15421
Reviewed-by: joao
|
| |\ \ \ \ \ \ \ \ |
|
| | |\ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Add branch prediction macros
Add methods for traversing and combining QProcessEnvironment.
Handle the HTTP 418 reply properly in QNAM
absorb translations.pri into translations.pro
let generated flag control SQL generation
Add version attributes as per ODF specification
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
New methods that make QProcessEnvironment more friendly. With these
two new functions developers no longer have to resort to using
QStringList and use the deprecated QProcess::setEnvironment() method.
New methods:
- QStringList QProcessEnvironment::keys()
- void QProcessEnvironment::insert(const QProcessEnvironment &).
Merge-request: 1152
Reviewed-by: ossi
Reviewed-by: thiago
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Previously, if QSqlField's QVariant value had type "invalid", this
caused the field to be omitted in data-changing SQL statements generated
from QSqlRecord edit buffers.
Complaints against this mechanism:
- It precludes initializing value type to field type, which would
otherwise seem sensible and useful, such as when using model.data() in
contexts where the field type is not readily available.
- QSqlField::clear() does initialize value type to match field type and
so is incompatible with this mechanism.
- Problems such as described in QTBUG-13211.
- Unwanted distinction between "invalid" and "null" when mapping field
values to SQL values.
- QSqlField's generated flag already provides a mechanism for
controlling SQL generation.
These complaints are redressed here by replacing this mechanism with
reliance on QSqlField's generated flag. The flag is initialized to false
in new edit records and set to true when a value is set. Applications
can still manipulate generated flags directly to control SQL generation.
Generation of SELECT statements already used the generated flag and is
unaffected by this change.
Merge-request: 1114
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Michael Goddard
|
| | |\ \ \ \ \ \ \ \ \
| | | |/ / / / / / /
| | |/| | | | | | | |
|
| | | |\ \ \ \ \ \ \ \
| | | |_|_|/ / / / /
| | |/| | | / / / /
| | | | |_|/ / / /
| | | |/| | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Add missing test file.
Changing width of RTL positioner doesn't relayout
Fix TextInput auto test failure on mac.
PinchArea and Flickable don't work well enough together
Fix auto test failure.
Once Image sourceSize is set there is no way to clear it.
Rotation transform with NaN angle can cause crash
Canceling image download while reading causes crash
Fix width of TextInput micro focus rectangle.
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Missing from ea304fb207b681ee084c4ce9bc61d1dd847bd7b0
Change-Id: If69b16fe71c69c174968868afed5647d6ea414a8
Task-number: QTBUG-17829
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
If the width of the layout changes then the items must be laid out
again.
Change-Id: I2b97bd45d07842fd3da2a0637391473ed6d78aa8
Task-number: QTBUG-18501
Reviewed-by: Michael Brasser
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Allow for some error due to additional padding on mac.
Change-Id: Iee9ce8eb9c4cec2f96c22340162f628ffcbd44d1
Reviewed-by: Bea Lam
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Allow PinchArea to be more aggressive in grabbing the gesture and
keep the gesture until all touches are released.
Change-Id: Ic80b7c4c478e1ee3b1c3da0772553756d9d5473f
Task-number: QTBUG-17829
Reviewed-by: Bea Lam
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Add test file ommited from b94176e69efc3948696c6774d5a228fc753b5b29.
Change-Id: Ia5436974a4941f50c8f1636196372e5b8a90be5f
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Image sourceSize lacked a RESET method to allow reverting to the
natural size of the image.
Change-Id: I4e9089d8e16991375745db553f891bd377143eab
Task-number: QTBUG-18442
Reviewed-by: Yann Bodson
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
When used in conjunction with Text resulted in massive memory
consunmption.
Change-Id: I5e19cb54bcd57b1ea32d17641f976f8288611a9e
Task-number: QTBUG-18386
Reviewed-by: Charles Yin
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Remove the padding QLineControl::cursorRect() adds for region updates.
QGraphicsView also grew the rectangle by returning the bounding rect
of the transformed rectangle which is fixed by using the same transform
for QRect as is used for QRectF.
Change-Id: I8d8df9dbc6b4250e4e5392871191123a76b304a0
Task-number: QTBUG-18343
Reviewed-by: Martin Jones
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
it appeared in the merge of 4.7 and master, because the fix was
backported.
|
| | |\ \ \ \ \ \ \ \
| | |/ / / / / / /
| | | | / / / / /
| | |_|/ / / / /
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
doc/src/declarative/example-slideswitch.qdoc
doc/src/development/qmake-manual.qdoc
doc/src/snippets/code/doc_src_qmake-manual.pro
doc/src/snippets/code/doc_src_qtscript.qdoc
src/corelib/animation/qabstractanimation.cpp
src/s60installs/bwins/QtOpenGLu.def
src/s60installs/eabi/QtOpenGLu.def
src/s60installs/eabi/QtOpenVGu.def
tests/auto/qdir/qdir.pro
tests/auto/qsslsocket/tst_qsslsocket.cpp
tools/qdoc3/doc/qdoc-manual.qdocconf
|
| | | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QSoftkeyManager auto test update
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Updated correct values to simulateSymbianCommand function calls. It is
defined in QSoftKeyManagerPrivateS60 that left and right softkeys are
0 and 2, now these values are used in test also.
The signal spy actions have been updated to track the correct
button in checkSoftkeyEnableStates-function.
Task-number: QTBUG-18375
Reviewed-by: Sami Merila
|
| | | |\ \ \ \ \ \ \
| | | |/ / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Corrected case mismatch.
Fixed pro file syntax in demos/spectrum
Fix for failing autotest QToolBar/Symbian
Removed useless Exit button in Symbian^3
|
