| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
Updated WebKit to f943ead2759537527faa7f3cb057d995291663b9
|
| |/
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Integrated changes:
|| <https://webkit.org/b/31779> || QWebPage::findText() does not clear selection when passed empty string ||
|| <https://webkit.org/b/37316> || [Qt] tests/hybridPixmap fails ||
|| <https://webkit.org/b/40359> || [Qt] Imperfect dependency for generated SVGNames.cpp ||
|| <https://webkit.org/b/40490> || [Qt] Typo error in QWebPluginFactory Documentation ||
|| <https://webkit.org/b/40401> || REGRESSION: [Qt] When dragging onto a page that handles the drag in Javascript it will be a move and not a copy by default ||
|| <https://webkit.org/b/35861> || [Qt] Add documentation to the QtWebkit bridge ||
|| <https://webkit.org/b/39958> || [Qt] TextBreakIteratorQt performance ||
|| <https://webkit.org/b/40535> || [Qt] GraphicsLayer: recaching images creates an unnecessary deep copy ||
|| <https://webkit.org/b/36569> || SQLStatementErrorCallback's return value needs to be converted to a boolean ||
|| <https://webkit.org/b/39357> || [QT] QT_BEARER flag is not enabled on S60 properly ||
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Show EditorDateEdit before changing selection in qdatetimeedit test
Moved runonphone target to prf files for all build systems.
Incorrectly named keys in QS60StyleEnums::SkinParts
Fix recursive targets for src.pro
Fix recursive 'make sis' for symbian builds
Fixed destdir not being defined.
Enable runonphone target for libraries as well.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In Symbian plaform showing a widget automatically focuses it by design,
which breaks this test case. Changed the selection change to happen
after widget show, as this test case doesn't require it to happen
before show.
Task-number: QTBUG-11046
Reviewed-by: axis
|
| | |\ |
|
| | | |\ |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This reduces code duplication.
RevBy: Miikka Heikkinen
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Local variables can't be counted upon between different profiles.
RevBy: Trust me
|
| | | | |
| | | |
| | | |
| | | | |
RevBy: Miikka Heikkinen
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Dependencies to tools moc, rcc and uic on some subdirs break recursive
targets like 'make sis' for symbian-abld and symbian-sbsv2 builds.
There is no need to have any subdir dependencies for above mkspecs as
those builds are always ordered anyway.
Task-number: QTBUG-5312
Reviewed-by: Janne Koskinen
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
It makes no sense for 'sis' to depend on 'first' or really any target
in symbian-abld and symbian-sbsv2 builds, as all builds are recursive
anyway.
Also do not generate real sis targets for projects that do not
actually deploy anything, making the check equivalent to one
in qmake for generating pkg files.
Task-number: QTBUG-5312
Reviewed-by: Janne Koskinen
|
| | | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Some of the internal part names of QS60Style do not match the real
theme item names, making automated tool use to make "theme blob"
for QCreator simulator manual work.
Renamed the parts to match native side names.
Task-number: QTBUG-11053
Reviewed-by: Alessandro Portale
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (31 commits)
Fixed an on-exit crash for apps using GL.
QMetaType: do not crash when registering builtin stream operator
Fix another potential strstr() crash for EGL based GL apps.
Fixed an on-exit application crash for GL apps using EGL.
Compile fix.
QWidget::childAt for masked child widgets doesn't work properly
Optimized 90-, 180-, and 270- rotated blits in raster paint engine.
Rename QLocale::isWrittenRightToLeft() to textDirection()
Fixed some bugs in detection of keyboard directionality
Add a isWrittenRightToLeft() method to QLocale.
consistent handling of directionality in QTextLayout
For an empty line edit the cursor position is depending on input language
correctly initialize the bidi level in the text engine
Use the textDirection() of blocks correctly.
Add QTextBlock::textDirection()
Make sure LayoutDirectionAuto is the default text direction
LayoutDirectionAuto is the default layout direction for QPainter
Correct BiDi behavior of QLineEdit
The default text direction for QTextOption is Qt::LayoutDirectionAuto
Handle setting the layoutDirection to Qt::LayoutDirectionAuto
...
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If a QGLWidget is left on the heap when the QApplication destructor is
called, it will leave the QGLWidget in a broken state.
The widget itself is released and set to a non-created state,
which the associated QGLContext doesn't get notified about.
With this patch the QGLWidget knows when QWidget::destroy() is called
and can act acordingly.
Task-number: QT-3498, QTBUG-10995
Reviewed-by: Paul
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
It is not required to register builtin operator, but old code might
do so if a type was not builtin before.
This is the case of QVariant which became builtin only in Qt 4.7
Task-number: QTBUG-11316
Reviewed-by: Gabriel
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: releated to QT-3498
Reviewed-by: Samuel
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QT-3498
Reviewed-by: Samuel
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The PFNGLXCREATECONTEXTATTRIBSARBPROC typedef isn't defined on all
GLX 1.3 systems, so we use our own.
Reviewed-by: Trond
|
| | |\ \ \
|/ / / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (26 commits)
QWidget::childAt for masked child widgets doesn't work properly
Optimized 90-, 180-, and 270- rotated blits in raster paint engine.
Rename QLocale::isWrittenRightToLeft() to textDirection()
Fixed some bugs in detection of keyboard directionality
Add a isWrittenRightToLeft() method to QLocale.
consistent handling of directionality in QTextLayout
For an empty line edit the cursor position is depending on input language
correctly initialize the bidi level in the text engine
Use the textDirection() of blocks correctly.
Add QTextBlock::textDirection()
Make sure LayoutDirectionAuto is the default text direction
LayoutDirectionAuto is the default layout direction for QPainter
Correct BiDi behavior of QLineEdit
The default text direction for QTextOption is Qt::LayoutDirectionAuto
Handle setting the layoutDirection to Qt::LayoutDirectionAuto
Introduce LayoutDirection Qt::LayoutDirectionAuto
Fix QString::isRightToLeft() to conform with Unicode Bidi algorithm
small optimisation
QVarLenghtArray: Add typedefs for stl compatibility.
prefer QElapsedTimer over QTime
...
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (26 commits)
QWidget::childAt for masked child widgets doesn't work properly
Optimized 90-, 180-, and 270- rotated blits in raster paint engine.
Rename QLocale::isWrittenRightToLeft() to textDirection()
Fixed some bugs in detection of keyboard directionality
Add a isWrittenRightToLeft() method to QLocale.
consistent handling of directionality in QTextLayout
For an empty line edit the cursor position is depending on input language
correctly initialize the bidi level in the text engine
Use the textDirection() of blocks correctly.
Add QTextBlock::textDirection()
Make sure LayoutDirectionAuto is the default text direction
LayoutDirectionAuto is the default layout direction for QPainter
Correct BiDi behavior of QLineEdit
The default text direction for QTextOption is Qt::LayoutDirectionAuto
Handle setting the layoutDirection to Qt::LayoutDirectionAuto
Introduce LayoutDirection Qt::LayoutDirectionAuto
Fix QString::isRightToLeft() to conform with Unicode Bidi algorithm
small optimisation
QVarLenghtArray: Add typedefs for stl compatibility.
prefer QElapsedTimer over QTime
...
|
| | | |\ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Problem was that we didn't take the children's effective mask
into account when checking whether a point was inside or not.
This commit is also an optimization since we no longer check the point
against the widget's rect twice. Furthermore, unnecessary
QRegion operations are completely avoided in the common case.
Auto tests included.
Task-number: QTBUG-7150
Reviewed-by: paul
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Blitting a 90-degree rotated RGB16 image now takes 40 % of
the time it used to on the N900.
Task-number: QT-3057
Reviewed-by: Kim
|
| | | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (23 commits)
Rename QLocale::isWrittenRightToLeft() to textDirection()
Fixed some bugs in detection of keyboard directionality
Add a isWrittenRightToLeft() method to QLocale.
consistent handling of directionality in QTextLayout
For an empty line edit the cursor position is depending on input language
correctly initialize the bidi level in the text engine
Use the textDirection() of blocks correctly.
Add QTextBlock::textDirection()
Make sure LayoutDirectionAuto is the default text direction
LayoutDirectionAuto is the default layout direction for QPainter
Correct BiDi behavior of QLineEdit
The default text direction for QTextOption is Qt::LayoutDirectionAuto
Handle setting the layoutDirection to Qt::LayoutDirectionAuto
Introduce LayoutDirection Qt::LayoutDirectionAuto
Fix QString::isRightToLeft() to conform with Unicode Bidi algorithm
small optimisation
QVarLenghtArray: Add typedefs for stl compatibility.
prefer QElapsedTimer over QTime
Allow to build Qt in static with mingw
Protected call to glXChooseFBConfig with appropriate defines.
...
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This is more in line with the rest of Qt.
Reviewed-by: Simon Hausmann
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The mapping table on X11 had a few bugs. Implemented
rudimentary support on QWS and fixed a tiny issue on
Mac.
Reviewed-by: Simon Hausmann
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This helps us keeping the code in the key mappers
that detect keyboard changes simple and is useful
for other cases as well.
Task-number: Part of QT-3292
Reviewed-by: Simon Hausmann
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Make sure we use the same method to determine RTL/LTR
for the layout everywhere.
Task-number: Part of QT-3292
Reviewed-by: Simon Hausmann
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Ensure the cursor is on the right if the keyboard layout is
for a right to left language.
Task-number: Part of Qt-3292
Reviewed-by: Simon Hausmann
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
If the text options doesn't specify the layout
direction, determine it from the content.
Reviewed-by: Simon Hausmann
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: Part of QT-3292
Reviewed-by: Simon Hausmann
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The method returns the resolved text direction
for the block. It implements P1-P3 of the
Unicode bidi algorithm.
Task-number: Part of Qt-3292
Reviewed-by: Simon Hausmann
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
QTextFormat::intProperty requires a small change to ensure
we return the right value for layoutDirection.
No need to change QTextFormat::property, as an invalid
QVariant will be returned if the layoutDirection is not
explicitly set.
Reviewed-by: Simon Hausmann
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Don't retrieve the layout direction from QWidget or
QApplication anymore. Respect if somebody explicitly sets the
direction with setLayoutDirection().
Task-number: Part of QT-3292
Reviewed-by: Simon Hausmann
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* LayoutDirectionChange event doesn't affect the text anymore.
* Default text direction is determined from string
* Qt::Key_Direction_L/R forces the layout direction
Task-number: Part of Qt-3292
Reviewed-by: Simon Hausmann
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The change is binary compatible, even though the changed bitfield is
being accessed inline. The reason is that we extend by a bit that
has previously been initialized to 0. bitordering will ensure that old
code reads Qt::LayoutAuto as Qt::LeftToRight.
Task-number: Part of QT-3292
Reviewed-by: Simon Hausmann
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Setting it to LayoutAuto will be ignored on an
application level (only LeftToRight or RightToLeft
are valid).
On a widget level is does the same as calling unsetLayoutDirection().
Reviewed-by: Simon Hausmann
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Extend the enum to contains a value that can be used
to hint that we would like to determine the text
direction from the content.
Reviewed-by: Simon Hausmann
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Rules P2 and P3 demand us to ignore the LRE/LRO/RLE/RLO
characters for determining the paragraph direction.
Task-Number: Part of QT-3292
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Don't use fromLocal8Bit() when comparing an ascii string
to a QString, use QLatin1String.
|
| | | | | |\ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QVarLenghtArray: Add typedefs for stl compatibility.
prefer QElapsedTimer over QTime
Allow to build Qt in static with mingw
Protected call to glXChooseFBConfig with appropriate defines.
Use the new OpenGL 3.* context/profile if asked with X11/GLX.
Splitted attrib_list generation into buildSpec from QGLContext::tryVisual.
Fix QTransform::map(const QPainterPath &) not working with paths that
|
| | | | | | |\ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QVarLenghtArray: Add typedefs for stl compatibility.
prefer QElapsedTimer over QTime
Allow to build Qt in static with mingw
Protected call to glXChooseFBConfig with appropriate defines.
Use the new OpenGL 3.* context/profile if asked with X11/GLX.
Splitted attrib_list generation into buildSpec from QGLContext::tryVisual.
Fix QTransform::map(const QPainterPath &) not working with paths that
|
| | | | | | | |\ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QVarLenghtArray: Add typedefs for stl compatibility.
prefer QElapsedTimer over QTime
Allow to build Qt in static with mingw
Protected call to glXChooseFBConfig with appropriate defines.
Use the new OpenGL 3.* context/profile if asked with X11/GLX.
Splitted attrib_list generation into buildSpec from QGLContext::tryVisual.
Fix QTransform::map(const QPainterPath &) not working with paths that
|
| | | | | | | | |\ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QVarLenghtArray: Add typedefs for stl compatibility.
prefer QElapsedTimer over QTime
Allow to build Qt in static with mingw
Protected call to glXChooseFBConfig with appropriate defines.
Use the new OpenGL 3.* context/profile if asked with X11/GLX.
Splitted attrib_list generation into buildSpec from QGLContext::tryVisual.
Fix QTransform::map(const QPainterPath &) not working with paths that
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Merge-request: 599
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Merge-request: 678
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
| | | | | | | | | |\ \ \
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Allow to build Qt in static with mingw
Protected call to glXChooseFBConfig with appropriate defines.
Use the new OpenGL 3.* context/profile if asked with X11/GLX.
Splitted attrib_list generation into buildSpec from QGLContext::tryVisual.
Fix QTransform::map(const QPainterPath &) not working with paths that
|
| | | | | | | | | | |\ \ \
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Allow to build Qt in static with mingw
Protected call to glXChooseFBConfig with appropriate defines.
Use the new OpenGL 3.* context/profile if asked with X11/GLX.
Splitted attrib_list generation into buildSpec from QGLContext::tryVisual.
Fix QTransform::map(const QPainterPath &) not working with paths that
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
Some functions were marked with Q_DECL_IMPORT where they should just be
Q_CORE_EXPORT. The reason is that this macro is expanded to nothing in
case of static builds whereas Q_DECL_IMPORT isn't (it is a dllimport).
That leads the linker to try to import it and it shouldn't.
Task-number: QTBUG-10791
Reviewed-by: gabi
|
| | | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
Reviewed-by: Trond
|
