| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qmake/generators/makefile.cpp
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
src/corelib/global/qnamespace.h
src/gui/text/qtextcontrol.cpp
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
QmlDebug: Fix license headers in new ost plugin
Fixed autotest after b4b85257ccff6ba21bcbcbd46a9f7f09884abe79
Resolve unqualified attached properties correctly
Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Symbian.
QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp'
QDeclarativeDebug: Don't crash when connection is closed
Fix so concurrent jobs produce the correct model results
Fix uninitialized variable.
|
| | | |
| | |
| | |
| | | |
Change-Id: I7371d5c2f76254e6746d5a86874a045fc6aec32d
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When resolving unqualified attached properties, we should use the scope
object, not the context object. Otherwise they will always resolve to the
root object of the context, regardless of where they are written.
In this example,
QtObject {
id: root
QtObject {
id: me
property int a: AttachedObject.x
}
}
the attached object should be loaded on the "me" object, not the "root"
object.
Change-Id: I386f886f62df7b8020c3ff703cdfc891d5739713
Reviewed-by: Martin Jones
|
| | |\ \
| | |/
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Add pincharea.qmlproject file for PinchArea example.
Moving contentY by large values in List/GridView is slow
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We needed to create/destroy every delegate between the current position
and the new position. Now we estimate element at the new position and
just create the elements from that item.
Change-Id: I9da1354cbadb4e44fafc1a0bee619d058d1e06a2
Task-number: QTBUG-14974
Reviewed-by: Bea Lam
|
| | |\ \
| | |/
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix TextEdit cursorRectangle property.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Translate the cursor rectangle from control coordinates to painting
coordinates rather than the other way around, ensure the cursor
delegate is also translated, and update the cursor rectangle, cursor
delegate and micro focus when the preedit cursor changes position.
Change-Id: Iac7a87f7fb965d5f56d059d8f4b97feef8b47789
Task-number: QTBUG-18515 QT-4827
Reviewed-by: Martin Jones
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (21 commits)
Have the backing store destroyed also in special Symbian scenarios.
Use FixNativeOrientation on Symbian when the application wants it.
QS60Style: itemview item with checkbox and text is drawn incorrectly
Revert "Have the backing store destroyed also in special Symbian scenarios."
Add focus frame support in style sheet
Two QListView autotests do not pass on Symbian^3 releases
tst_QStyle::drawItemPixmap test case fails on Symbian^3
Add the auto detection for OpenVG in configure
Add focus frame support in stylesheet
Make QS60Style to support new Tab graphics in new Symbian releases
GraphicsView is not reset if focusItem is not set when keyboard closes
Check the validity of qt_desktopWidget before dereferencing
Labels are not visible in dialogs with all themes (part2)
Labels are not visible in dialogs with all themes
Enable webkit for symbian-gcce in configure
Enable webkit build for the makefile build system with gcce
Add the rules for gcce in do_not_build_as_thumb.prf
Correct some parameters for the makefile build sytem, armcc and gcce
Support QMAKE_LFLAGS.ARMCC and QMAKE_LFLAGS.GCCE in makefile build system
Do not unnecessarily draw application twice in landscape
...
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
tst_QListView::taskQTBUG_2678_spacingAndWrappedText() fails because:
QS60Style adds to the itemview item content size margins and empty
space, which shouldn't be part of the content size.
As a fix, remove these.
taskQTBUG_435_deselectOnViewportClick() fails because:
Sending a click to a selected itemview item, when it should be sent
to below that specific one. It was using hardcoded (center + 20) and
autotest assumed that this would be outside of first item.
In S60 with touch support, the itemview items are rather tall
(49 pixels). As a fix, autotest now uses calculated value, which
ensures that click is sent to outside first item.
Task-number: QT-4810
Reviewed-by: Tomi Vihria
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The autotest assumes that created QPixmap are exactly same irregardless
how the pixmaps were created. However, there is no guarantee that
pixmaps that look the same (i.e. in this case green rectangles)
are "same". QPixmap is platform dependent and might have e.g.
optimized format in some of the platforms.
Task-number: QT-4805
Reviewed-by: Jani Hautakangas
|
| | |\ \ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
ListView has wrong keyPressEvent behaviour when vertical
Ensure view is positioned correctly when orientation changes.
Fix regression in wigglytext.qml
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: I7fbedff965ae8c89dcbb96ba5dcee85c07aa29b1
Task-number: QTBUG-17065
Reviewed-by: Bea Lam
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This change re-adds the code removed in
8e9c28eaa4d7a3372b9a9a21a984701b62f96456 (which caused this regression),
while keeping the new code as well (to specially handle the case of
registration in componentCompleted()).
Change-Id: I707e3d2ead9ea25079f79cd5e5886d1dc1c69d1b
Task-number: QTBUG-18362
Reviewed-by: Aaron Kennedy
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (163 commits)
QLocale: Fixed double to currency string conversion on Mac.
Fix qstringbuilder4 test on mac
Compile on Mac.
Revert "HTTP caching internals: fix logic for PreferNetwork and PreferCache"
Use the qt_static_metacall in QueuedConnection
Fix crash after merge of the native symbian thread branch.
Fix bad merge
Re-apply part of ba8e5eedf5f40091eb67dd391a7dcaf9299db2f5
Removed useless comment
SSL code: introduce new error value for blacklisted certificates
Disable DEF files by default for symbian-gcce.
HTTP caching internals: fix logic for PreferNetwork and PreferCache
Added a consistency check for number of missing symbols in elf2e32.
Updated def file after symbol removal.
QLocalSocket: fix abort on Windows.
QStringBuilder: add operator += for QString and QByteArray
Dummy commit to trigger pulse.
Fix QMetaObject::indexOfSlot
Fix compilation
Documentation for the initilize_list constructor
...
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This also fixes the autotest failure on mac with macDefaultLocale test.
Reviewed-by: trustme
(cherry picked from commit 78d47f520b2c4acdf782d39311063f5d44376913)
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The behaviour is different with or without QT_FAST_OPERATOR_PLUS
And since on old gcc it is not defined, then the test fails.
With the normal operator+, the bytearray will first be converted to
a QString, and loose everything that is after \0, but now, with
QStringBuilder, we do not do QString conversion anymore, so no data
is lost.
We do not want to specify the behaviour here, so we remove the test.
Reviewed-by: Joao
|
| | |\ \ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This reverts commit e5d27e7aeac984e46f3aa8de20160cc00fc63155.
Broke the CI.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The memory leak was fixed in two different ways in
b6c60b0c9778f51af8c80f853d840ba25910c6f4 and
0ee221b374ffef3657247be4c78e05689e04bef7
after the merge, the thread are now deleted twice.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
improve error reporting by introducing a new enum value in case the
peer certificate is blacklisted.
Reviewed-by: Markus Goetz
Task-number: QTBUG-18338
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
PreferNetwork means: send out a request and read from cache if it has
not been modified.
PreferCache means: load resource from cache if it has not expired yet.
This commit makes the cache behave according to the documentation.
Reviewed-by: Markus Goetz
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
src/corelib/thread/qthread_unix.cpp
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Optimize cases when we have.
string += someString + someOtherString
Avoid the allocation of one temporary string.
Behaviour change:
byteArray += someString + QByteArray("foo\0bar", 7)
before, the array would end at foo because of the conversion to string
Reviewed-by: hjk
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The wrong offset was added
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Joao
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
... to also verify template prefix and corner cases with runs of less
than 6 Xs.
Reviewed-by: Olivier Goffart
Reviewed-by: Robin Burchell
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-4796
Reviewed-by: Olivier Goffart
Reviewed-by: Robin Burchell
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Olivier Goffart
Reviewed-by: Harald Fernengel
Reviewed-by: Robin Burchell
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
changes include whitespace, parenting, recovering erroneously deleted
code etc.
Reviewed-by: Markus Goetz
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Merge-Request: 2505
Reviewed-by: Peter Hartmann
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Faster disk cache for mobile devices. Reduce file-system touching
operations and work around FAT performance issues. Features new
on-disk layout. Cached objects are now saved in multiple
subdirectories and filenames are shorter in length.
Merge-Request: 2505
Reviewed-by: Peter Hartmann
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
stringbuilder.cpp(160) : error C2666: 'operator +' : 2 overloads have similar conversions
stringbuilder.h(416): could be 'QStringBuilder<A,B> operator +<QByteArray,char[5]>(const A &,const B (&))'
with
[
A=QByteArray,
B=char [5]
]
or 'built-in C++ operator+(__int64, char [5])'
while trying to match the argument list '(QByteArray, char [5])'
The reason is the cast to QNoImplicitBoolCast (which is int)
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This breaks source compatibility if one made its own QConcatenable
as it nows require a Prefered type.
And also sometimes if QT_USE_FAST_OPERATOR_PLUS was used, and
the result of an addition between two QByteArray is used directly
Reviewed-by: Denis
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: brad
Reviewed-by: thiago
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Testing that slot from destroyed class are not called
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Merge-request: 1011
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This fix the qnetworkreply::ioPostToHttpsUploadProgress() auto test.
Before the readbuffer where always limited to 1k for ssl sockets.
Reviewed-by: Markus Goetz
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-17092
Reviewed-by: Zeno Albisser
Reviewed-by: Liang Qi
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
...the private class is cheap anyway; and lazy construction lead to
problems like setting an empty default configuration would crash etc.
Reviewed-by: Markus Goetz
Task-number: QTBUG-17550
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Qt::LocalTime==Qt::UTC.
Merge-request: 1159
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
|
| | |\ \ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Instead of returning a QStringList, return the list of QLocale objects
that can be used directly.
Reviewed-by: axis
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
if there is a QEventDispatcher in QAdoptedThread.
QAdoptedThread is supposed to be destroyed when the QThreadData is
destroyed. But QThreadData is ref-counted, and QEventDispatcher holds
a reference to it. QEventDispatcher is supposed to be destroyed
in QThreadPrivate::finish, which is supposed to be called from the
destructor of QAdoptedThread.
There is a circular dependence. We break it by calling finish in the
callback that is called when the thread is finished.
Task-number: QTBUG-17986
Reviewed-by: Brad
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-18149
Reviewed-by: Morten Sorvig
|
| | | | | | | | | |
|
| | |\ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
src/corelib/tools/tools.pri
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Reviewed-by: trustme
|
