| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| | |
* '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
|
| | |
|
| |
| |
| |
| | |
Reviewed-by: Aaron Kennedy
|
| | |
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (104 commits)
Fixed tst_maketestselftest::tests_pro_files failure
remove nasty hack by using a stricter regexp (for language codes)
cosmetics: quote the dot in the regexp
remove dependency of ts targets on sub-tools
add commit-ts target to commit ts files without line number info
(re-)add 'untranslated' ts targets
more fine-grained ts targets
split qt_help out into an own ts target
Unbreak the Maemo 5 build after the Symbian fix
QNAM HTTP: Fix problem with cached files and metaDataChanged()
Add a testcase for QTBUG-11213 to prevent future regressions.
Autotest: reenable the NTLM proxy test on tst_QTcpSocket
Autotest: add a small, boring test for QAuthenticator
Add documentation for the QAuthenticator options.
Expose the QAuthenticator map of options in the API.
Add a QAuthenticatorPrivate parsing for the headers without QHttpResponseHeader
Revert BIC change "Build Qt with option -Zc:wchar_t under MSVC"
Fix for tst_qmdisubwindow::fixedMinMaxSize failure on Cocoa
Add unit tests for QMimeData.
fix qconfig.h reference for shadow builds
...
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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: QTBUG-12201
Reviewed-by: Michael Brasser
|
|\ \ \ \ |
|
| |\ \ \ \ |
|
| | |/ / /
| |/| | |
| | | | |
| | | | | |
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
|
|\ \ |
|