| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\ |
|
| | |
| |
| |
| |
| |
| | |
This reverts commit d22c8c60ffd986cc46d1f1cab878d60b03b5d4ea.
The change is not binary compatible
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (48 commits)
build fix for S60
Improve handling of QAction in soft key manager
Remove useless assert
qdrawhelper: fix optim in 2245641ba
QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage
accelerate QWindowsPipeWriter for bigger chunks of data
Fix antialiasing with transformed text in OpenGL2 paint engine
Fix flattening of largely scaled, thin, dashed beziers.
Increased the precision used to flatten beziers
Fix QT_NO_MOVIE
Fix compile error with QT_NO_ACTION in QtGui
Fix QT_NO_COMPLETER
Fix QT_NO_FSCOMPLETER
Fix QT_NO_FILESYSTEMMODEL
Build fix
Safeguard ourselves against corrupt registry values for cleartype gamma
fix cetest build properly
qdrawhelper: optimize the fetch transformed bilinear functions
Compile fix for WinCE
Make sure the selectionChanged signal is not called too much
...
|
| | | | |
|
| | | |
| | |
| | |
| | | |
It also reduces QActionPrivate by 16 bytes.
|
| | | |
| | |
| | |
| | | |
It would make qconfig crash.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The commit 2245641baa58125b57faf12496bc472491565498 was not correct
as the x2 (and y2) were not correct on the first line (the value was
1 instead of 0)
Fixes tst_QImage::smoothScale3
Reviewed-by: Samuel Rødal
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (147 commits)
doc fixes
Don't test XmlListModel examples on platforms without QtXmlPatterns
More error output for QML_IMPORT_TRACE=1
Fix declarative examples autotest, avoid using native separators
Doc: update Rectangle smooth painting screenshot.
Add some TextInput properties and methods
Remove GraphicsObjectContainer from the documentation.
import Qt 4.6 -> import Qt 4.7
Move documentation code to snippet.
Test fix.
Fix test
Fix test on QWS.
Fix PathView crash.
Make bindings dump more useful
Improve font value type documentation.
coding conventions
Doc fixes
Warning
Read Maemo orientation at startup
Exclude gestures from examples autotest
...
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (130 commits)
Warning
Read Maemo orientation at startup
Exclude gestures from examples autotest
Exclude proxywidgets from examples autotest
Fix crash on QScriptProgram destruction
doc fixes
Start documenting coding conventions
Adds missing qml file to qdeclarativeflipable autotest
Revert "Better reporting of extension plugin loading errors."
Doc
Fix graphicswidget auto-test.
Add Mac OS X bundle description for qml runtime
Cleanup
Disallow writes to read-only value type properties
Allow undefined to be assigned to QVariant properties
Add a Qt.isQtObject() method
Fix crash in QML library imports
Remove QT_VERSION checks in QML
List properties aren't read-only
Small doc fix.
...
|
| | | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (119 commits)
Add Mac OS X bundle description for qml runtime
Cleanup
Disallow writes to read-only value type properties
Allow undefined to be assigned to QVariant properties
Add a Qt.isQtObject() method
Fix crash in QML library imports
Remove QT_VERSION checks in QML
List properties aren't read-only
Small doc fix.
Make sure WorkerScript thread is stopped on deletion. This also fixes
Release ListModel's worker agent on deletion.
Doc fixes
Fix example
Example code style improvements
Enable other wrapping modes.
TextEdit::wrap changed to TextEdit::wrapMode enumeration
Remove use of obsolete "Script" element.
unwarn
Replace "var" with "variant" in tests
Fix test after deletion of GraphicsObjectContainer.
...
|
| | | | | |\ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Cleanup minehunt example
Keep track of the item count to avoid calling model->count() during batched changes
Allow iteration over the Item.children property
Add QListModelInterface::modelReset() signal and emit this in
Compile
Allow MouseArea.Drag.target to be reset.
Document MouseEvent.accepted.
Initialize drag movement correctly if drag.target is set after mouse move.
Expand test.
Honor the startDragThreshold in MouseArea drag.
Don't crash if a target isn't specified for AnchorChanges.
Optimization: Only allocate QScriptValue if we need too
Crash: Assign context in CreateSimpleObject too
Optimization: Minor object allocation speedup
Optimization: Improve allocation strategy for QDeclarativeDeclarativeData
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
QTBUG-9645
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Apply the ~QObject QDeclarativeData logic to ~QWidget
|
| | |_|_|_|_|/
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
There have been reports of several people who expect
QFont::NoFontMerging to turn off all automatic resolution of fonts
when displaying text. However, the flag only turns off automatic
font resolution within a script item. Suitable fonts for scripts not
supported by the current font are still picked automatically. We cannot
change the behavior of QFont::NoFontMerging, so the documentation has
been made clearer and task QTBUG-9816 has been created to implement a
new style strategy flag that supports the use case.
Task-number: QTBUG-1732
Reviewed-by: Trond
|
| |\ \ \ \ \ \
| |/ / / / /
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (44 commits)
QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage
accelerate QWindowsPipeWriter for bigger chunks of data
Fix antialiasing with transformed text in OpenGL2 paint engine
Fix flattening of largely scaled, thin, dashed beziers.
Increased the precision used to flatten beziers
Fix QT_NO_MOVIE
Fix compile error with QT_NO_ACTION in QtGui
Fix QT_NO_COMPLETER
Fix QT_NO_FSCOMPLETER
Fix QT_NO_FILESYSTEMMODEL
Build fix
Safeguard ourselves against corrupt registry values for cleartype gamma
fix cetest build properly
qdrawhelper: optimize the fetch transformed bilinear functions
Compile fix for WinCE
Make sure the selectionChanged signal is not called too much
Implement heightForWidth support for QTabWidget and QStackedLayout.
Fix the doc for QFrame::frameStyle
Don't use texture-from-pixmap if the target isn't GL_TEXTURE_2D
Add runtime check for GLX >= 1.3 before using glXCreatePixmap
...
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-9674
Reviewed-by: jbache
|
| | |\ \ \ \ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Samuel
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Merge-request: 2321
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Merge-request: 2356
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Merge-request: 2357
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Merge-request: 2358
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Eskil
Task: http://bugreports.qt.nokia.com/browse/QTBUG-7596
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Since we know that x1 and y1 are between the bounds, and than x2 and
y2 are bigger, we only need to check the upper bound for x2 and y2
This gives 5% speedup on a trace from the QML samegame demo.
Reviewed-by: Samuel Rødal
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
It could happen that it was called with empty selectionrange
Now we check to see if the selection ranges are empty
Task-number: QTBUG-9507
Reviewed-by: gabi
|
| | | |\ \ \ \ \
| | | |/ / / /
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
src/3rdparty/phonon/ds9/mediaobject.cpp
|
| | | |\ \ \ \ \ |
|
| | | | |\ \ \ \ \
| | | | |_|/ / /
| | | |/| | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (27 commits)
Fix the doc for QFrame::frameStyle
Don't use texture-from-pixmap if the target isn't GL_TEXTURE_2D
Add runtime check for GLX >= 1.3 before using glXCreatePixmap
QDrawHelper: Reduce code duplications
Improve matching X11 VisualIDs to EGL configs
Remove obsolete function set_winapp_name()
Speedup fetchTransformedBilinear in the fast_matrix case
Allow y-interted pixmaps for brushes in GL2 paint engine
Build fix for mingw
Fix build with mingw (64 bit)
Make configure.exe compatible with mingw 64
Adjust indentation
e-Ink support cleanup
Tweak the display update IOCTL calls
Support 8-Track e-Ink devices
Get stride from LinuxFB instead of calculating it ourselves.
Use DIR_SEPARATOR when setting up variables for RCC and UIC in features.
Fixed bug in QPainterPath::intersected().
Fix compile error with QT_NO_ANIMATION
O(n^2) to O(n) optimization in QTreeWidget::selectedItems()
...
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The default is QFrame::Plain (and not QFrame::NoFrame)
Task-number: QTBUG-9728
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
And apply same optimisation as in 6a9e6f4780f5fc3aaf34f93c85de575f81c91e48
for duplicated code
Reviewed-by: Samuel Rødal
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Use the individual channel sizes to match rather than the combined
per-pixel sizes.
Task-number: QTBUG-9444
Reviewed-By: Trond
|
| | | | |/ / / /
| | |/| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
In order to add the support we also had to add hasHeightForWidth to
QWidget that calls the new virtual hasHeightForWidth() in QWidgetPrivate
Task-number: QTBUG-7792
Reviewed-by: Paul
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
3% faster on a trace from the qml samegame.
Reviewed-by: Samuel Rødal
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Adjust indentation to match the rest of the file
Merge-request: 417
Reviewed-by: Tom Cooksey <thomas.cooksey@nokia.com>
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* make fixupScreenInfo a protected virtual function
* Change is8Track bool to DriverType enum
* Document new functions
Merge-request: 417
Reviewed-by: Tom Cooksey <thomas.cooksey@nokia.com>
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
It seems to be best practice to pass the "update flash" command only
when the entire display needs to be updated, while the refresh call
without updating flash is sufficient for updating smaller regions
Merge-request: 417
Reviewed-by: Tom Cooksey <thomas.cooksey@nokia.com>
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This patch adds support for e-Ink devices based on the 8-Track chipset,
such as the Sony PRS-505.
The 8-Track driver is a Linux framebuffer driver with a few extensions
and a few glitches in information reporting.
Merge-request: 417
Reviewed-by: Tom Cooksey <thomas.cooksey@nokia.com>
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
When we compute the angle delta we can't use qFuzzyCompare as it will
cause slightly negative deltas to be snapped to 0, causing the winged
edge builder to put path edges in the wrong order.
Task-number: QTBUG-3778
Reviewed-by: Trond
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-7414
Author: Tasuku Suzuki <tasuku.suzuki@nokia.com>
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
As we need to ensure that there will be no duplicates in the list
returned by QTreeWidget::selectedItems() (see commit
ea75d434e40100a9abf56195b646a8efdf3c1288), we now use a QSet to ensure
unicity while keeping the same order as before.
Reviewed-by: Olivier
Task-number: QTBUG-9485
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Make sure we set the EGL_KHR_image_base define when we define the
reset of the extension defines. This also makes eglCreateImageKHR
get defined when previously it wasn't.
Reviewed-By: TrustMe
|
| | | |\ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
It could happen (with MDI widgets) that the first actions would not be
visible.
Task-number: QTBUG-9560
Reviewed-by: gabi
|
| | | | | |_|/ /
| | | |/| | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The problem was seen in Qt Creator (in the 'Sources' tab of the debugger).
Same logic as in above() and bellow()
Reviewed-by: Gabriel
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
In 30bd59a1dec78 we added a fallback from font config
to XLFD in the case where font config could not supply
us with the correct pixel size for a given font.
Primarily, this was for when you would try to print
a bitmap font on a high resolution printer. This caused
a problem for applications that set a point size on
a bitmap font, since the calculated pixel size would
not be available. For UIs you will usually prefer to
select the font with the correct family but nearest
pixel size here, which is what font config does. We
would however choose the fallback and if XLFD failed
to load the font in question, you would get a
substitution. Since getting the correct font family
seems more important than getting the correct pixel
size, we disable the fallback in the case where XLFD
does not find the correct font. This will fix the bug
where UI fonts were frequently created with the wrong
family on e.g. Fedora, and it might cause some trouble
with printing bitmap fonts, however, it was deemed
that bitmap fonts are not ideal fonts to use for
printing. In cases where XLFD can load the bitmap
fonts, the fallback will still be used.
Task-number: QTBUG-4428
Reviewed-by: Trond
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Since the paint engine now transforms the prerendered glyphs instead of
rendering transformed glyphs as paths, we need to turn on texture
filtering to avoid antialiasing artifacts. In order to do this, we also
need to pad the glyphs in the glyph cache, otherwise you will get
artifacts when sampling the area around the glyph's bounding rect (where
there might be other glyphs.) This done by adding a glyphPadding()
function to the cache which returns the number of pixels to pad between
each glyph.
Task-number: QTBUG-9706
Reviewed-by: Tom
|
| |\ \ \ \ \ \ \
| |_|_|_|_|/ /
|/| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
qmake/generators/symbian/symmake.cpp
src/gui/image/qimage.cpp
src/openvg/qwindowsurface_vgegl.cpp
|
| | |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix crash with QTextEdit::textChanged() when deleting a character
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
QTextEdit::textChanged() will be emitted from a function called from
within QTextCursorPrivate. If the code connected to textChanged()
makes a local copy of the current text cursor and then causes it
to detach, we will crash when returning to QTextCursorPrivate and
trying to access the now-deleted data. To avoid this, we make a local
reference to the current text cursor that gives us a guarantee that
it will be valid throughout the delete-call.
Task-number: QTBUG-9599
Reviewed-by: Gunnar
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This fixes a problem with accessibility and QFileDialog, in addition the
fix to complexwidgets.cpp will also fix any itemview that uses a root
index.
Reviewed-by: Jan-Arve
|
