| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix crash on Desktop platforms.
|
| | |
| |
| |
| |
| |
| | |
Missing check for null networkSession.
Task-number: QTBUG-12501
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( d521d7d81e8f0297c94be9ebd8af67ee130d0edb )
Workaround for QTBUG-8013: Do not return an ascent of 0
Fix crash when all the items in a QListView are hidden
Removed QEXPECT_FAIL macros from test cases which now pass
Ensure backing store is deleted before top-level window
One more .pro fix for deprecated INCPATH
Fix Rhys' qmake warnings
Fixed QVideoSurfaceFormat::isValid()
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/gui/itemviews/qlistview.cpp
tests/auto/qlistview/tst_qlistview.cpp
tests/auto/qnetworkreply/test/test.pro
tests/auto/qsocks5socketengine/qsocks5socketengine.pro
|
| | | | |
|
| |/ /
| |
| |
| | |
QTBUG-11938 and QTBUG-10801
|
| | |
| |
| |
| | |
Task-number: QTBUG-12493
|
| | |
| |
| |
| | |
Task-number: QTBUG-12469
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix QT_NO_DATESTRING
Check the gesturemanager pointer before accessing it.
Added files that had been renamed.
Modified file/directory names and text to remove disallowed terminology.
Cherry pick fix for MOBILITY-1077 from Qt Mobility.
Fix typo in docs.
Cherry pick fix for MOBILITY-1145 from Qt Mobility.
Cherry pick fix for MOBILITY-1144 from Qt Mobility.
Fixed the following sub-tasks for QTBUG-12192
|
| | |\ \
| | | |
| | | |
| | | | |
into 4.7
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
7ef45318255c5cf1f10508753c9a2c55fc2cb8c0
321bd8b7b54e34a983b1ba142af836cf3e153a66
|
| | | | | |
|
| | |/ / |
|
| |/ / |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (42 commits)
Update QtDeclarative def files
Fix crash in MouseArea
Compile
Fixes undeleted timers (and endless warning from the event loop about
Remove unneeded member variable.
Fix test.
Generalize qml "registration"
Fix compiler warning
Fix TextInput echoMode autotest on Linux
Reuse QML lexer to simplify .pragma script logic
Fix TextEdit text attribute and text stored in the internal QTextDocument having different contents
Remove QDeclarativeItem::childrenChanged() signal overload
Update QtGui and QtDeclarative def files
Make rootContext and engine pointers in QDeclarativeView API const
Add additional QVariant benchmarks.
Allow MouseArea dragging to filter mouse events from descendants
Expand QDeclarativeExtensionPlugin docs
Add missing snippet files
Expand QtObject doc
Indicate default values
...
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (26 commits)
Expand QDeclarativeExtensionPlugin docs
Add missing snippet files
Expand QtObject doc
Indicate default values
Use snippets instead to avoid quoting license headers
Rename remaining 'wantsFocus'.
Bounding rect of text was not always calculated correctly.
Add QML tutorials to the tutorials page
QML focus API updates.
Do not show copyright header in documentation.
Ensure redirects (and indeed all reply process) is done in the right thread.
Only ignore the same target value for a Behavior when it is running.
Fix clock example: make sure hands always moves forward.
font.letterSpacing used percentage rather than absolute values.
Rewinding AnchorChanges should not make target item's implicit width and height explicit
Compile: include <float.h> for usage of FLT_MAX.
Restore the FLT_MAX define.
Make Item::transformOriginPoint read-only
Ensure the boundingRect() of Text is correctly calculated.
Better defaults for MouseArea's drag.
...
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-12292
|
| |/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The configurations returned from QNetworkConfiguration::children() are
guaranteed to be in priority order. Ensure that this order is reflected
in the tree view.
Task-number: QTBUG-11678
RevBy: juhvu <qt-info@nokia.com>
|
| |/ /
| |
| |
| | |
attributes.
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Convert examples and demos to use Bearer Management.
Fixes deployment rules for embedded qml demos application.
Fix build on Symbian.
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Convert examples and demos to use Bearer Management.
Fixes deployment rules for embedded qml demos application.
Fix build on Symbian.
|
| | | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-10439
|
| | | | | |
|
| |/ / / |
|
| |\ \ \
| |/ / |
|
| | |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
tests/auto/qtexttable/tst_qtexttable.cpp
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This commit attempts to fix the latest staging failure.
According to Nokia Legal, .pro files are not copyrightable and thus need
not carry license headers. In any case, C-style comments aren't valid
for .pro files and broke the build.
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits)
Doc: Added license documentation for 3rd party code and data.
Do not crash if addrinfo signal does not contain ip address information.
Link to the unsinstalled libraries first.
Doc: Excluded the QML documentation from the Qt-only set.
Doc: Whitespace fixes.
Doc: Fixed whitespace issues.
Revert the change in applicationShouldTerminate().
Added LatinAmericaAndTheCaribbean country to the doc.
Network Proxy Query: Fix memleak on OS X
Doc: Reviewed Michael's model/view tutorial and overview document.
Doc: Removed accidentally committed file.
Doc: Fixed incorrect QML property type.
new image for tutorial.qdoc
replaced image, license headers, more links in modelview.qdoc file
Doc: Added the standard three clause BSD license header.
I've cleaned up the qdoc file a bit.
correction of snippet tags
integrating modelview tutorial in the build system, first attempt
new version of modelview.qdoc with snippets
Rolands ModelView Source
...
|
| | | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
tools/qdoc3/test/qt.qdocconf
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Trust Me
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Trust Me
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Trust Me
|
| | | | |\ \ \ |
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Trust Me
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | |\ \ \ \ \
| | | |_|_|/ /
| | |/| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* '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
|
| | | | | | | | |
|
| | | |\ \ \ \ \
| | | |/ / / /
| | |/| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
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
...
|
| | | | | |\ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
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
|
| | | | | | |_|/ /
| | | | |/| | | |
|
| | | | | | |/ /
| | | | |/| | |
|
