| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
...
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (70 commits)
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
fixed built-in jpeg and tiff in configure.exe, QTBUG-12093
fix indentation
fix build for -no-qt3support
Compile fix for bearermonitor example
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.
...
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | |
|
| | | | |
|
| | | | |
|
|\ \ \ \ |
|
| |\ \ \ \ |
|
| | |/ / /
| |/| | |
| | | | |
| | | | | |
Task-number: QTBUG-12167
|
| |/ / /
|/| | | |
|
|\ \ \ \ |
|
| |/ / / |
|
| |\ \ \
| | | |/
| | |/| |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Happened when currentItem was on a section boundary.
Task-number: QTBUG-12089
|
| |/ /
|/| | |
|
|/ /
| |
| |
| |
| | |
Task-number: QTBUG-12115
Reviewed-by: Martin Jones
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
Ancestors of the item with focus should only report wantsFocus as true
when they are a FocusScope or a top-level item.
Reviewed-by: Aaron Kennedy
Reviewed-by: Yann Bodson
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-12086
Reviewed-by: Michael Brasser
|
| |
| |
| |
| | |
Reviewed-by: Aaron Kennedy
|
|\ \ |
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
Replace the usages of Follows with Behaviors, update docs.
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
Do not stop a spring animation if the to value got
changed while notifying the target property change.
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
(should be handled by image providers, elements shouldn't have to know
about the capabilities)
|
| | |
| | |
| | |
| | |
| | |
| | | |
QDeclarativeImageProvider to provide pixmaps instead.
Task-number: QTBUG-11980
|
| | | |
|
|/ / |
|
| |
| |
| |
| | |
QTBUG-11954
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
synchronous loading of QImages. (QPixmaps can only be created in the
main thread so they will always be loaded synchronously).
This changes request() to requestImage() and adds requestPixmap()
for pixmap support.
Task-number: QTBUG-11989
|
|\ \ |
|
| | | |
|
|/ /
| |
| |
| | |
QTBUG-11933
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
if you have stuff like
Rectangle { function foo() {... } }
We let QtScript, and hence the debugger know the function name.
Reviewed-by: Roberto Raggi
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The QDeclarativeSpringAnimation is a replacement for
QDeclarativeSpringFollow. The idea is to remove the Follows
quickly.
Follows used to have an inSync property. In order to provide
an alternative mechanism, the commit also fixes the
running property for animations which are controlled by a
behavior. Previously running would always return false and
never change. Now running does change and indicates that the
animation is running indeed.
|
| | |
|
| |
| |
| |
| | |
Task-number: QTBUG-11986
|
| |
| |
| |
| |
| |
| | |
updateSize() shouldn't trigger another updateSize().
Reviewed-by: Martin Jones
|
|\ \ |
|
| | | |
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
doc/src/declarative/extending.qdoc
|
| | |\ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
If the new currentIndex is in view, then there is no need to cancel
a flick that is in progress.
Task-number: QTBUG-11405
|
| | | | | |
|
| |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This may mean that the cursor is to the right of the width, so components should
cater for that with a margin if they are boxed / clipped.
TextInput used to try to account for right bearing (and left bearing incorrectly since
it added it on the right). This is removed. Potentially this means that for some fonts
the text repaints incorrectly on the left or right, but if that is the case Text and TextEdit
already had such a problem (undetected), and all will need fixing.
Task-number: QTBUG-11983
|
| |/ /
|/| |
| | |
| | |
| | | |
Task-number: QTBUG-10297
Reviewed-by: Martin Jones
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-11932
Reviewed-by: Martin Jones
|