| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
Reviewed-by: Denis Dzyubenko
|
| |
|
|
| |
Reviewed-by: TrustMe
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Don't add generic subdirs project twice.
Remove debug, quiet warnings.
Fix memory leaks and valgrind errors.
QStroker: Fix erroneous SvgMiterJoin behavior for parallel lines
Revert "Properly implement qobject_cast for const pointers."
Bearer management: Fix compilation with namespace.
fetch next token after class definition opening
delay next token fetching when opening namespace
don't let operator overloads confuse us
don't try to show source when no locations are given
Implement a private API for setting title widgets
Fix the bug for QSettings on Windows, to store qint32/quint32, qint64/quint64 in Windows registry.
fix CRLF
Added private API to install an x11EventFilter
NTLM code: Save domain in different variable
Update the error handling of invalid hostnames in QUrl.
Remove unsupported code from qobject.h for MSVC < .NET 2003
Properly implement qobject_cast for const pointers.
Revert "Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page"
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
QLineF::intersect() yields an undefined intersectionPoint for parallel
lines. Thus if the distance to 0,0 is shorter than the current miter
limit, we would draw a triangle to 0,0.
Handle this by not drawing the triangle for parallel lines.
This matches the behavior of Qt::MiterJoin.
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Bearer management: Fix compilation with namespace.
fetch next token after class definition opening
delay next token fetching when opening namespace
don't let operator overloads confuse us
don't try to show source when no locations are given
Implement a private API for setting title widgets
Fix the bug for QSettings on Windows, to store qint32/quint32, qint64/quint64 in Windows registry.
fix CRLF
Added private API to install an x11EventFilter
NTLM code: Save domain in different variable
Update the error handling of invalid hostnames in QUrl.
Remove unsupported code from qobject.h for MSVC < .NET 2003
Properly implement qobject_cast for const pointers.
Revert "Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page"
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Bearer management: Fix compilation with namespace.
fetch next token after class definition opening
delay next token fetching when opening namespace
don't let operator overloads confuse us
don't try to show source when no locations are given
Implement a private API for setting title widgets
Fix the bug for QSettings on Windows, to store qint32/quint32, qint64/quint64 in Windows registry.
fix CRLF
Added private API to install an x11EventFilter
NTLM code: Save domain in different variable
Update the error handling of invalid hostnames in QUrl.
Remove unsupported code from qobject.h for MSVC < .NET 2003
Properly implement qobject_cast for const pointers.
Revert "Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page"
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Meego and Orbit use client side decorations, so implement a top-level
layout in QMainWindow that allows us to set title widgets. To prevent
regressions on other platforms, the API is disabled by default.
Rev-By: Robert Griebl
Rev-By: Thierry Bastian
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Some libs need to intercept X11 events without actually being able
to subclass QApplication, so add a private API to allow setting
event filter functions.
Reviewed By: Robert Griebl
|
| |/ / /
| | |
| | |
| | | |
Reviewed-by: Sarah Smith
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix crash in QRuntimeGraphicsSystem due to destruction order.
Fix crash in OpenVG when failing to allocate large VGImages.
Updated 4.7.0 changelog
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Firstly, fix a "leak" by deleting the graphics system when QApplication
is destroyed.
Secondly, fix a crash when the following scenario occurs:
- ~QApplication() deletes the current graphics system (see above)
- ~QApplication() calls qt_cleanup()
- qt_cleanup() calls QPixmapCache::clear() to delete pixmaps
- ~QRuntimePixmapData() tries to remove the pixmap from the runtime
graphics system, but it has already been deleted.
- *Crash*
Reviewed-by: Gunnar Sletta
Reviewed-by: Jani Hautakangas
|
| |\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Prevented crash in GL window surface when deleting native child widgets.
Fix a regression where setPreferredSize(QSize(100, -1)) did not work.
Force MeeGo touch to use native graphics system for now.
Fixed compiler warnings in meego graphics system helper.
Added meego graphics system helper to features/qt.prf and syncqt.
Use QFactoryLoader to ensure we get the correct graphics system plugin.
Updated license headers for meego graphics system helper.
Fixed compilation and API of meego graphics system helper.
Renamed meego graphics system helper files.
Imported meego graphics system helper sources.
Updated license headers for meego graphics system.
Fixed compilation and API of meego graphics system.
Renamed meego graphics system files.
Imported meego graphics system sources.
Fix cache_cost initialization of QFontEngineMultiWin
Fix crash when using unprintable chars in QStaticText
Don't waste memory on the share widget in the GL window surface.
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Regressed by change 515991426832a6333f2fd9e639bd4c83e2b27cef
Reviewed-by: Frederik Gladhorn
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
MeeGo touch doesn't yet work with other graphics systems since it
assumes that QPixmaps are XPixmap based. If MeeGo touch doesn't link
against the graphics system helper we'll force it to use the native
graphics system.
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Originally, QFontEngineMultiWin does not set its cache_cost according to
the regular font engines it refers to, which makes cache management in
QFontCache useless because cache_cost is always 0, and garbage
collecting timerEvent can hardly be triggered. This patch solve part of
the problem by using cache_cost of the first font engine for
QFontEngineMultiWin.
However, if a font engine is loaded by QFontEngineMulti::loadEngine, the
cost is still not counted.
Task-number: QTBUG-12562
Reviewed-by: Eskil Abrahamsen Blomfeldt
|
| | |/
| |
| |
| |
| |
| |
| |
| |
| | |
The assumption that the output glyph array and input glyph array is
of equal size is wrong when unprintable characters are used (and
discarded in getGlyphPositions())
Task-number: QTBUG-12614
Reviewed-by: Jiang Jiang
|
| |/
|
|
|
|
|
|
|
|
|
|
|
| |
When inputting only numbers, the symbol menu should not do anything.
However in the old code the resource id of the symbol table was still
being set, so the symbol key on N97 would look up a table that was
not valid for the current input mode and crash.
Fixed by setting the symbol table id to zero under those conditions.
RevBy: Sami Merila
Task: QTBUG-13472
AutoTest: Included
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Editable QComboBox popup immediately closes itself after a click
Change RLibrary handle in QS60PluginResolver to be process wide
Cursor is misplaced in the editors text area
QSslSocketPrivate::systemCaCertificates() hangs sometimes on Symbian
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Editable QComboBox popup immediately closes itself after a click
Change RLibrary handle in QS60PluginResolver to be process wide
Cursor is misplaced in the editors text area
QSslSocketPrivate::systemCaCertificates() hangs sometimes on Symbian
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is due that timer that blocks for while mouse release events
(blockMouseReleaseTimer) is not started. There is an optimization
in QComboBox that tries to avoid calling d->viewContainer() since
that method creates the viewContainter if it doesn't exist.
Unfortunately this optimization does not take into account if the
container is already created.
In this particular case, viewContainer is already created, but
since QComboBox creates a QLineEdit, it skips the timer start,
which leads to situation where combobox's popup menu receiving
mouse release event and thus closes itself.
As a fix, blockMouseReleaseTimer is started if the viewContainer is
already created.
Task-number: QTBUG-13231
Reviewed-by: axis
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When QInputMethodEvent::Cursor with value 0 is sent to QLineEdit,
cursor is still visible.
QLineControl (text control widget inside QLineEdit) handles the
internal state of cursor visibility correctly and then promptly ignores
the state when drawing the text.
Issue is corrected by checking the cursor visibility state when drawing
the cursor into widget.
Task-number: QT-3670
Reviewed-by: axis
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The scrolling internal member was not changed in cas the text was
bigger than the lineedit.
Task-number: QTBUG-13520
Reviewed-by: gabi
|
| |/ /
| |
| |
| |
| |
| | |
since QTransform does not inherit QObject its redundant
Reviewed-by: gunnar
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix tst_qimage with QT_NO_EXCEPTIONS
qdrawhelper: Optimisations in fetchTransformedBilinear
qdrawhelper: use SSE2 for interpolation in fetchTransformedBilinear
qdrawhelper: small optimisations in fetchTransformBilinear
QEasingCurve::operator== returning wrong value
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix tst_qimage with QT_NO_EXCEPTIONS
qdrawhelper: Optimisations in fetchTransformedBilinear
qdrawhelper: use SSE2 for interpolation in fetchTransformedBilinear
qdrawhelper: small optimisations in fetchTransformBilinear
QEasingCurve::operator== returning wrong value
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Scaling down, no rotation, with SSE2.
Specialize for ARGB32 not tiled, so the pixelbound can be simplified
Reviewed-by: Samuel
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
when scale down, with no rotations
Process the pixel 4 by 4 and do the interpolation using SSE2
Reviewed-by: Samuel
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Another way to compute the interpolation that does less multiplications.
Small inpact on benchmark
Made-with: Samuel
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Preparations for Application font support on Symbian
Task-Number: QTBUG-6611
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Preparations for Application font support on Symbian
Task-Number: QTBUG-6611
|
| |/ /
| |
| |
| |
| |
| | |
Preparations for Application font support on Symbian
Task-Number: QTBUG-6611
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Let's not duplicate Symbian softkey menu top-level actions in submenu.
Remove some .pro statements left behind after IAP usage cleanup
Ignore MAKEFILE variable for Symbian abld and sbsv2 builds.
|
| | |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The old code incorrectly added the toplevel menu to menubar, where as
submenu should have been added. This change only has impact to case
where menu is being manually constructed by creating softkey action
with menu and by adding actions to that menu. Normal "Options" menus
are already working correctly.
Task-number: QTBUG-12189
Reviewed-by: Miikka Heikkinen
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Add missing license header
Fixed input context trying to squeeze content into a full widget.
Cleaned up position tracking in the Symbian input methods.
Revert "Long-press shortcuts for symbols on QWERTY keyboard don't work"
Compile fix MinGW, 5738dcd705e7edde816940f9c0ab2c364c81ad20 broke it.
Compile fix WinCE
Ensure that we load system libraries from the correct location.
Some small Solaris fixes.
Fix QtScript Date <--> QDateTime (local time) conversion
Fix Qt applications freezing until mouse/keyboard events occur.
Recognize GL_ARB_shader_objects as indicating shaders
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Add missing license header
Fixed input context trying to squeeze content into a full widget.
Cleaned up position tracking in the Symbian input methods.
Revert "Long-press shortcuts for symbols on QWERTY keyboard don't work"
Compile fix MinGW, 5738dcd705e7edde816940f9c0ab2c364c81ad20 broke it.
Compile fix WinCE
Ensure that we load system libraries from the correct location.
Some small Solaris fixes.
Fix QtScript Date <--> QDateTime (local time) conversion
Fix Qt applications freezing until mouse/keyboard events occur.
Recognize GL_ARB_shader_objects as indicating shaders
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Add missing license header
Fixed input context trying to squeeze content into a full widget.
Cleaned up position tracking in the Symbian input methods.
Revert "Long-press shortcuts for symbols on QWERTY keyboard don't work"
Compile fix MinGW, 5738dcd705e7edde816940f9c0ab2c364c81ad20 broke it.
Compile fix WinCE
Ensure that we load system libraries from the correct location.
Some small Solaris fixes.
Fix QtScript Date <--> QDateTime (local time) conversion
Fix Qt applications freezing until mouse/keyboard events occur.
Recognize GL_ARB_shader_objects as indicating shaders
|
| | | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
qmake/Makefile.win32
src/corelib/io/qfsfileengine_win.cpp
src/corelib/kernel/qeventdispatcher_win.cpp
src/gui/dialogs/qfiledialog_win.cpp
src/gui/inputmethod/qcoefepinputcontext_s60.cpp
src/gui/text/qfontdatabase_win.cpp
src/gui/util/qsystemtrayicon_win.cpp
src/script/utils/qscriptdate.cpp
tests/auto/qinputcontext/tst_qinputcontext.cpp
tests/auto/qscriptengine/tst_qscriptengine.cpp
|
| | | | | |\
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Add missing license header
Compile fix MinGW, 5738dcd705e7edde816940f9c0ab2c364c81ad20 broke it.
Compile fix WinCE
Ensure that we load system libraries from the correct location.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This was a security hole that has been there for a while, but the
public awareness have recently rised so the threat is more imminent
now.
The solution is to fix all places where we dynamically load system
libraries. More specifically, we now load all system libraries with
an absolute path that points to a library in the system directory
(usually c:\windows\system32).
We therefore introduce a small class named QSystemLibrary that only loads
libraries located in the system path. This shares some of the API with
QLibrary (in order to make the patch as small as possible).
We don't fix QLibrary due to risk of regressions. In
addition, applications can fix the code that calls QLibrary themselves.
The problem does not apply to Windows CE, since the search order is
documented as not searching in the current directory.
However, it touches some CE-specific code - therefore QSystemLibrary
is sometimes used on WinCE (however, it will just do a normal
LoadLibrary() since its safe anyway).
This change does not affect the testability plugin (it is not clearly
documented where that plugin is located, and the plugin should never
be used in production code anyway)
Loading OpenSSL libraries
The ssl libraries are handled specially, and searched in this order
(we cannot expect them to always be in the system folder):
1. Application path
2. System libraries path
3. Trying all paths inside the PATH environment variable
Task-number: QT-3825
Reviewed-by: Thiago Macieira
Reviewed-by: Peter Hartmann
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Problem was reproduced on N97. If the FEP detects that the widget is
full while still editing text, it will try to send those events as
key events instead. Since this screws up the content in the widget,
we stop those events from reaching the widget in the input context.
AutoTest: Passed
Task: QTBUG-12949
RevBy: Miikka Heikkinen
(cherry picked from commit 5ca6264933af60b3cd376b7f08bea008fa69b515)
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This fixed a case where using password mode would lead to Qt
believing that the cursor was one step to the left of where it really
was. This would have the effect of replacing the last character
instead of appending to it, and even crashing if the cursor was all
the way to the left.
The code is also much cleaner this way, but it meant that QTBUG-9867
had to be solved differently this time. We do this by assuming that
and empty FEP update means "erase last character", which seems to
work well in practice.
Also added a long overdue autotest for the FEP input methods. Most
tests pass, but some don't, which I will try to fix later.
Task: QTBUG-9867
Task: QTBUG-12949
RevBy: Miikka Heikkinen
AutoTest: Included
(cherry picked from commit 52cf47565e402dc682038ccaf8d725401802b603)
|
| | | | | |/
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This reverts commit 05eacd9ad40f8adb5aaa12a8b90113a73b43f642.
Conflicts:
src/gui/inputmethod/qcoefepinputcontext_p.h
src/gui/inputmethod/qcoefepinputcontext_s60.cpp
(cherry picked from commit c5901037f0d3ccd45b0c79b38ef5b04552dad0aa)
|
| |\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Remove unnecessary function declarations from qpixmap_s60_p.h
Fix text size issues for high ppi displays
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: TRUSTME
|
| |\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Always call QPainter::end() before using the object drawn to.
Doc: Reworded a brief description for clarity.
Doc: Added a small note about using .pro files in SUBDIRS.
|
| | |\ \ \ \
| | | |/ /
| | |/| | |
|
| | |\ \ \ \ |
|
| | |\ \ \ \ \ |
|
| | |\ \ \ \ \ \ |
|
