| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/declarative/whatsnew.qdoc
doc/src/examples/orientation.qdoc
doc/src/examples/webftpclient.qdoc
examples/declarative/ui-components/main/qml/pics/niagara_falls.jpg
src/corelib/global/qglobal.cpp
src/gui/text/qglyphs.cpp
src/gui/text/qplatformfontdatabase_qpa.cpp
|
| | | |
|
| | | |
|
| | |
| |
| |
| | |
Task-number: QT-4891
|
| | |
| |
| |
| | |
Task-number: QT-4891
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | |
| |
| |
| | |
Task-number: QTWEBSITE-229
|
| | | |
|
| | | |
|
| | | |
|
| | |
| |
| |
| | |
Task-number: QTBUG-19115
|
| | | |
|
| | |
| |
| |
| | |
Task-number: QTBUG-18954
|
| | | |
|
| | |\
| | |
| | |
| | | |
merge-requests/1220
|
| | | | |
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
QmlViewer: Translate UI
Fix insert and scroll to bottom case
QDeclarativeDebug: Fix test case
QDeclarativeDebug: Handle case where client with ongoing queries is deleted
Remove compile warning
Fix QUnifiedTimer bug
Stop the animation driver when there are no more animations.
Optimization and benchmark for setting object properties from QML.
Add Constant and Final flags to QMetaObjectBuilder
Fixed QML TextEdit docs
Make -no-opengl exist on other platforms
Only ask for name when the user goes on the high score list.
|
| | | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
QmlViewer: Translate UI
Fix insert and scroll to bottom case
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Install translators for the Qt & QmlViewer translations. also
add QT_NO_CAST_FROM_ASCII, QT_NO_CAST_TO_ASCII to check for untranslated
strings.
Reviewed-by: Oswald Buddenhagen
Task-number: QTBUG-14848
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When using QtextCursor::insert() with a large text followed by setting
the vertical scrollbar to its maximum value (scroll to bottom),
QPlainTextEdit would not behave properly if a document size
change was triggered by the insertion due to line wrapping.
This was visible in Qt Creator.
Auto test included.
Reviewed-by: con
|
| | | | |\ \
| | | | |/
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: (485 commits)
Remove a race condition in SIGCHLD handler.
Fix warnings about && inside ||
Update XCreateWindow in qgl_X11egl.cpp
Allow enum values to be used as signal parameters
ListModel::clear() should not clear roles
Lancelot: support for custom keys added to protocol. API cleanup.
Make sure removed QTextBlock is invalid
Cocoa: Fixup wrong code in patch baaa5ae
Designer: Allow promoted QWidget's to be buddies.
Designer: Specify 'notr' attribute for buttongroup name.
[QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap)
HTTP cacheing: do not store the date header with the resource
Let's not write to the source buffer when blending argb32 on rgb16.
Add support for -unset <prop> option to qmake.
make -markuntranslated work without -idbased
fix conditional on shell type
Updated QtOpenGL DEF file
Lancelot: bail out if rendering consistently fails
Minor optimization to lance/elot
Make it possible to test the new font hinting in lance[elot]
...
|
| | | | | |\
| | | |/ / |
|
| | | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
QDeclarativeDebug: Fix test case
QDeclarativeDebug: Handle case where client with ongoing queries is deleted
|
| | | | | | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: I4be7080af1e7e8a834b927b6c6fc211db8bd90c0
Reviewed-by: Aaron Kennedy
|
| | | | |\ \ \
| | | | |/ /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: (93 commits)
Designer: Fix tab order in action editor dialog.
tst_qlocale: improve failure message in tst_QLocale::macDefaultLocale
Add a once-over unrolled fromLatin1 conversion (32 characters)
Add 16-byte loads of the Neon fromLatin1 functions
Fix warning about unused parameter
Make QtUiTools use the lib-infix passed to configure.
Skip failing tests
Removed old autotest references from Symbian build files
Icon in QMessageBox::question is deformed on Symbian
Prevent crash when connecting signal in splitview
GraphicsViews: Focused widget is not visible after orientation change
GraphicsViews: Focused widget is not visible after orientation change
Add missing nullify for the s60 style's background pixmap pointer.
Fixes QT-4753
sort out stdout vs. stderr usage
Updated QtGUI DEF files for WINSCW
Handle removal of setter for partialUpdateSupport
Remove the use of the QtTest baseline feature I reverted
Revert "Add a feature to QTestLib to correct benchmark results."
Use the ARM version of UTF-8 detection in the Neon code
...
|
| | | | | |\ \ |
|
| | | | |\ \ \ \
| | | | |/ / /
| | | | | | |
| | | | | | |
| | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
Remove compile warning
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Change-Id: If209db684878ab734b3265b479c59dfc27b18be1
|
| | | | |\ \ \ \
| | | | |/ / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: (262 commits)
Fix QUnifiedTimer bug
Designer: Avoid nested QDialog's in item widget content dialogs.
Designer: Remember default of main container's object name.
Optimized glyph uploads in GL texture cache.
Designer: Do not translate page object names of QMdiArea.
qmake vcproj generator: do not insert $(INHERIT)
Add flag for forcibly propagating backing store alpha to framebuffer
Fixed unmatched quotes in s60installs.pro
Added setSwitchPolicy to MeeGo graphicssystem helper API.
Add /q switch to QMAKE_DEL_FILE command in symbian
Remove undefined symbol from tst_qwindowsurface.
Fix def files
Changes to driver workarounds.
Switch to raster also when last window is destroyed (on MeeGo).
Fixes detected by the static-check
Fix accidental population of the disk cache with partial content
Fix disk cache interaction for range retrieval HTTP requests.
Fixup license headers in Lighthouse plugins
Fixes: some text fields in PNG image files were not read
Clipboard/Windows: Fix a hang when sending to non-responsive clients.
...
|
| | | | | |\ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Pause animations (like Timer) could trigger a jump to the next tick,
which meant that other pause animations would have missed the interval
skipped by the pause.
Change-Id: Idebe4cbe70b2a1536d684288fc1c5d65e4c5df84
Cherry-pick-of: 115d437efb25adc2262460e001c034ea3cd8ba14
Task-number: QTBUG-18126
Reviewed-by: Leo Cunha
Reviewed-by: Michael Brasser
|
| | | | |\ \ \ \ \
| | | | |/ / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
Stop the animation driver when there are no more animations.
Optimization and benchmark for setting object properties from QML.
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Change-Id: If03c9e4539e984db725f7e7d89e8b565890fcbed
Reviewed-by: Gunnar Sletta
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Change-Id: Ib923e5d3946e99001ef682a9dd8ca6d7788818a3
Reviewed-by: Aaron Kennedy
|
| | | | |\ \ \ \ \
| | | | |/ / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: (345 commits)
QS60Style: QTreeView::indexRowSizeHint returns incorrect value
Fix TextEdit mouseSelectionMode overriding selectByMouse.
Deprecate QScriptValue::UserRange
Deprecate QScriptValue::QObjectMember
Fix static text item positioning GL2 paint engine
Fix combining marks handling in Core Text shaper
Update QML "What's New" docs.
Don't reveal TextInput text on refocus in PasswordEchoOnEdit mode.
Fix ListView boundary extents for RTL layout.
Fix compiler warning.
Update copyright year to 2011.
Fix for major regression in OpenVG clipping
Fix QGraphicsScene returning incorrect focus item.
Cast int to HALData::TAttribute for QT_HALData_ENumCpus and compile with RVCT4.
Not requiring valid QTextBlock in previous()
Don't use EGL surfaces for translucency with 32MB GPU chip.
Fix for fromSymbianCFbsBitmap changing the source data unexpectedly.
Background app visible after split view closed
Configuring a static Qt build did not exclude WebKit if the -webkit option was given.
Get the number of cores from HAL on Symbian.
...
|
| | | | | |\ \ \ \ |
|
| | | | |\ \ \ \ \ \
| | | | |/ / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
Add Constant and Final flags to QMetaObjectBuilder
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Change-Id: I25090e833f7ce184bcbf2bc5b9281c27ab05aa2d
Reviewed-by: Michael Brasser
|
| | | | |\ \ \ \ \ \
| | | | |/ / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: (142 commits)
fix autotest on windows (again)
fix autotest on windows
Prevent stroking zero length lines in qstroker.cpp
Make the animation driver private API
Always prepend drive letter to $$EPOCROOT in Windows Symbian builds
Add files deployed using qmake_emulator_deployment.flm to 'what' list
Ammend last INTEGRITY fix
Stop using XLFD as fontconfig matching fallback
OpenGL Framebuffer Format
QRuntimeWindowSystem: Track window size properly
Fix qmake build on Windows
Fix QTBUG-17627: build break in mobility bearer applications
Add the missing image for doc of QNetworkSession.
Remove Qt dependancy to SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS
Fix QPlainTextEdit corruption/crash with scrolling
Add expected failures for JSC-specific bugs
fix test for QtLighthouse
Check engine existence before increasing reference count
Make autotest insensitive to exact JS error wording
Fix typo in autotest
...
|
| | | | | |\ \ \ \ \ |
|
| | | | |\ \ \ \ \ \ \
| | | | |/ / / / / /
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
Fixed QML TextEdit docs
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Removed non-existent enumeration value from docs.
Signed-off-by: Thiago Marcos P. Santos <thiago.santos@nokia.com>
Reviewed-by: Leonardo Sobral Cunha <leo.cunha@nokia.com>
|
| | | | |\ \ \ \ \ \ \
| | | | |/ / / / / /
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: (835 commits)
Workaround for QTBUG-17468
Removed timestamp setting and checking for Symbian header export
Cocoa/Alien: bugfix corner cases with popups and enter/leave
My 4.7.2 changes
Fix QFileDialog Symbian native file dialog filename filtering.
fix QMAKE_COPY_DIR for mingw+sh
Phonon MMF backend enabled in configuration and deployment
Using a better flag to control the fast allocator
Using QElapesedTimer for Symbian idle detector
Idle detector thread improvements
Updated QtGui and QtCore DEF files
Cocoa/Alien: bugfix corner cases with popups and enter/leave
Add experimental support for armCC on Linux
Fixed resizing popups with QSizeGrip on X11
fix crash when setting QPROCESS_DEBUG
My 4.7.2 changes
Fix QFileDialog Symbian native file dialog filename filtering.
fix QMAKE_COPY_DIR for mingw+sh
Add QDir/tree benchmark to "trusted" list
Added file header
...
|
| | | | | |\ \ \ \ \ \ |
|
