| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
The wantsFocus property has been renamed to activeFocus, to better
reflect its value. Reading and writing the focus property is also now
consistent -- this property represents focus within a scope. Other small
changes were made to keep things consistent with the new naming.
Reviewed-by: Aaron Kennedy
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Otherwise a Behavior may mistakenly not be triggered. This situation
can arise when the property in question has been manipulated via the
property system, followed by a direct function call (which correctly
bypasses the Behavior), followed by a another change via the property
system.
Task-number: QTBUG-12295
|
| |
| |
| |
| |
| |
| |
| | |
... and percentage is useless.
Task-number: QTBUG-12282
Reviewed-by: Warwick Allison
|
| |
| |
| |
| |
| |
| |
| | |
height explicit
Task-number: QTBUG-12273
Reviewed-by: Michael Brasser
|
|/
|
|
|
|
|
| |
i.e. the thread with the QNAM the original reply was created in.
Task-number: QTBUG-12302
Reviewed-by: Aaron Kennedy
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Make Item::transformOriginPoint read-only
Ensure the boundingRect() of Text is correctly calculated.
Better defaults for MouseArea's drag.
various doc improvements for animation elements
fixes for dynamic object creation docs
Change docs to show how to define enum properties
Improve documentation on setting arbitray transform origin points
Ensure released VisualItemModel items are removed from the scene.
Improve QML text rendering when LCD smoothing is enabled for OS X.
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Make Item::transformOriginPoint read-only
Ensure the boundingRect() of Text is correctly calculated.
Better defaults for MouseArea's drag.
various doc improvements for animation elements
fixes for dynamic object creation docs
Change docs to show how to define enum properties
Improve documentation on setting arbitray transform origin points
Ensure released VisualItemModel items are removed from the scene.
Improve QML text rendering when LCD smoothing is enabled for OS X.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We need to create our cached image in boundingRect() if it doesn't
already exist, to prevents painting errors.
Reviewed-by: Warwick Allison
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Also parent them back to the VIM to ensure correct destruction.
Task-number: QTBUG-12261
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Added missing deployment to autotest.
Fixed some deployment issues on Symbian.
Fixed a QSplashScreen hanging bug in S60 3.1 devices.
|
| | | | |
| | | | |
| | | | |
| | | | | |
RevBy: Trust me
|
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | | |
Both plugins should be part of the main package now.
RevBy: Trust me
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When the sections were moved calling logicalIndex on what was already
a logical index messed up the hidden sections.
Task-number: QTBUG-12268
Reviewed-by: Gabriel
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | | |
This case was broken and then fixed again recently, this testcase should
ensure that it does not break again in the future.
Reviewed-by: Andreas Kling
|
| |/
|/|
| |
| | |
Task-number: QT-3613
|
|/
|
|
|
|
|
|
| |
Looks like native png and jpeg libs on some devices have rounding
problems, so compare the color values with a fuzz of 3. This fixes
this test on Maemo 5 and 6.
Reviewed-by: Benjamin Poulain
|
|
|
|
|
|
|
| |
QDeclarativeVisualDataModel::stringValue() did not handle
QList<QObject*> model types.
Task-number: QTBUG-12005
|
|\
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Missed the actual change in 5572ec653fe735c4f413195c1ef34382aa8c6105
Always place PathView delegates centered on the path
Add a PathView example.
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The scale of the delegate was used to offset the item. This was a
bad way of making the item appear to be positioned correctly when
the default transform origin was the top-left. Now that transform origin
is center, it is obvious that it was a bad idea.
Task-number: QTBUG-12245
Reviewed-by: Michael Brasser
|
| |/
|/|
| |
| |
| |
| |
| |
| | |
This is (supposedly) more efficient as the compiler can optimise it to a
builtin, per Thiago.
Merge-request: 2430
Reviewed-by: Andreas Kling <andreas.kling@nokia.com>
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
tests/auto/network.pro
|
| | |
| | |
| | |
| | |
| | |
| | | |
This logic for private_tests was the opposite of what it should be,
meaning that network tests which use Q_AUTOTEST_EXPORTs have not been
run for some time :-(
|
|\ \ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
tests/auto/qtexttable/tst_qtexttable.cpp
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix RightBearing confusion in text layout
fixes, improvements for various docs and example code
Fixed debugger's evaluation of dynamic properties in context
Allow test to pass on smaller screens (eg. 480 high).
Minor animation doc improvement
|
| | | |/
| | |/| |
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | | |
Conflicts:
tools/qdoc3/htmlgenerator.cpp
|
| | | |
| | | |
| | | |
| | | | |
Add qauthenticator to tests/auto/network.pro
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 2427
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 2428
Reviewed-by: Andreas Kling <andreas.kling@nokia.com>
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (83 commits)
Crash while runnig tst_QMdiSubWindow::emittingOfSignals test on Cocoa
fix qconfig.h aliased header creation
fix warning directive on gnuc
qdoc: Removed navigation arrow that was causing display problems.
Silence warning when building with MSVC 2005
Fix an Assert in QTextTable
Revert "Fix an Assert in QTextTable"
Attempt to fix build failure with msvc200{5,8} on Windows XP.
fix macx not having UNICODE in DEFINES any more
doc: Fixed several qdoc warnings.
Fix an Assert in QTextTable
doc: Fixed several qdoc warnings.
QSslSocket: Improve error handling
qdoc: Fixed several <div> elements that had the "/>" ending.
QSslSocket: fix documentation for QSslSocket::setPeerVerifyMode()
qdoc: Fixed breadcrumbs for QML examples.
remove redundand translations project files
make projects lupdate-friendly
Timing fix for slow devices.
QNAM: Add future enum attribute for Zerocopy QNAM
...
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The problem was caused by the fragment id being inserted
in front of a cell spanning over several rows instead of
the next logical cell (or fragment_end) in the cells structure.
Task-number: QTBUG-11282
Reviewed-by: Simon Hausmann
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This reverts commit b2a4c7f0142a48f60e7ec4fc5866917e3da8b7c3.
Unit test tst_qtexttable::QTBUG11282_insertBeforeMergedEnding
fails on mac and Linux, reverting for now.
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The problem was caused by the fragment id being inserted
in front of a cell spanning over several rows instead of
the next logical cell (or fragment_end) in the cells structure.
Task-number: QTBUG-11282
Reviewed-by: Simon Hausmann
|
| | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Merge branch '4.7-upstream' into 4.7
Conflicts:
doc/src/declarative/advtutorial.qdoc
src/declarative/graphicsitems/qdeclarativeloader.cpp
src/declarative/graphicsitems/qdeclarativetextedit.cpp
src/declarative/qml/qdeclarativeengine.cpp
src/declarative/util/qdeclarativexmllistmodel.cpp
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Although the wait is only specified as 50ms, it might still take longer than
that for Qt to deliver the actual mouse release event (especially on
embedded devices). The problem here is that in the meantime the auto-repeat
on the button might have been triggered.
Reviewed-by: Dominik Holland
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (59 commits)
Doc: Cleaning style and adding support for Creator
Add NTLMv2 authentication support to QAuthenticator.
QIODPLB: Sync behavior of ungetBlock() and ungetChar()
QFileIconProvider: Load icons on demand.
Doc: fixing offline style
Fix handling of SSL certificates with wildcard domain names
Doc: fixing examples link
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
SSL library loading: load system libs only once
Revert "SSL backend: load libraries for certificates only once"
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
Doc: Adding support for Qt Creator style
doc: Fixed last of the declarative/QML qdoc warnings.
qdoc: Marked some missing declarative properties and functions as \internal.
qhelpgenerator: Fix namespace syntax checking.
...
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Merge-request: 731
Task-number: QTBUG-4455
Reviewed-by: Peter Hartmann
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
otherwise, tr() calls without absolute qualification will not be
properly qualified inside the first function if it has no qualification,
either.
Task-number: QTBUG-11742 (not really)
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Files fail to load when passing resoure path to mediasource.
The original regression seems to be caused by a behavior change
as reported here: http://bugreports.qt.nokia.com/browse/QTBUG-12015
Note a merge request is also pending on Gitorious
http://gitorious.org/phonon/phonon/merge_requests/17
Task-number: QTBUG-9323
Reviewed-by: thierry
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
the file names are given relative to the build directory, so the command
needs to be run in it as well. this is a more expected (and simpler) fix
than the alternative, which would be giving file names relative to the
source directory.
reasons not to fix:
- due to some other bug, the problem really affects only builds where
the build dir is not at the same level as the source dir - otherwise,
absolute paths would be passed anyway
- it has some breakage potential for the cases where the commands
actually expect being run in the source dir
- it can be worked around by manually injecting the cd statement into
the command
reasons why i still fixed it:
- it doesn't affect in-source builds, and it seems that most complex
build systems (which would define custom compilers with
depend_command) don't support shadow builds anyway
- people who needed things to work probably already used $$OUT_PWD somehow
(either a "cd" at the start, or prepending it to each path), so this
change will be practically a no-op
- "it's just dependencies, and these are known to be broken in qmake
anyway"
Reviewed-by: joerg
Task-number: QTBUG-1918
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
There were still a couple of functions that didn't have them. This
could cause said functions to crash if multiple script engines were
being used.
Reviewed-by: Jedrzej Nowacki
|
|\ \ \ \ \ \ \
| |_|_|_|_|/ /
|/| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (48 commits)
Remove test cases which cause stack overflow
Avoid a crash in the OpenVG paint engine when clipping to an empty path
Fix last character being overwritten in password field
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 038b62085831eef4dee423361c65ecd55b7b9b1d )
QSslSocket: Improve error handling
Compile when bootstrapping qmake
Fix regression in tst_qrand::testqrand()
syncqt: don't try to split %module's values
syncqt: fix wrong paths in include/ActiveQt/headers.pri
Fix a crash when recursing into QSharedPointer from QSharedPointer::clear()
Fix a couple of memory leaks due to not releasing CFTypes on Mac
Initalize the nativeDialogInUse variable
The Q_WGL define was removed years ago.
Compile
QUUid::createUuid() should not generate identical sequences on UNIX
typos fixed
Use lower case for including system header files
Added trace statements to Phonon MMF backend
Fix crash when removing columns in merged row
MMF Phonon backend: call winId() from VideoWidget constructor
...
|
| |\ \ \ \ \ \
| | |/ / / / /
| |/| | | | /
| | | |_|_|/
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
bin/syncqt
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp
src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.h
src/3rdparty/webkit/WebCore/page/FrameView.cpp
src/3rdparty/webkit/WebCore/page/FrameView.h
src/3rdparty/webkit/WebCore/platform/ScrollView.cpp
src/3rdparty/webkit/WebCore/platform/ScrollView.h
src/corelib/plugin/quuid.cpp
src/gui/dialogs/qfontdialog.cpp
src/multimedia/audio/qaudiodevicefactory.cpp
src/opengl/qgl.cpp
src/openvg/qpaintengine_vg.cpp
tests/auto/qxmlquery/tst_qxmlquery.cpp
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
We used to delete the tracked object before the new tracking was
properly set up in QSharedPointer. That means if the tracked object's
destructor or deletion function recursed into the QSharedPointer, it
would find itself in an inconsistent state.
So instead finish the setup and only then call out to user code. That
ensures the internal state is always valid.
Task-number: QTBUG-11730
Reviewed-by: ossi
|