| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| | |
Conflicts:
mkspecs/common/symbian/symbian.conf
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
tools/assistant/tools/assistant/helpviewer.cpp
|
| | |
| |
| |
| |
| |
| |
| |
| | |
The fixed point code in the raster paint engine's drawEllipse() function
causes rendering errors on ARM. Remove untested code and use the vector
path fallback instead.
Reviewed-by: Gunnar Sletta
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (26 commits)
QLocalSocket::isValid on Windows must check for broken connection
fix pipe handle leak in qlocalsocket_win.cpp
GraphicsViewBenchmark: Run app in full screen mode on small desktops.
Fix Thai text on Windows 7
Fix License headers.
QTextCodec::codecForName. Insert in the cache in all cases.
Prevented calling the pixmap filter implementations with null pixmaps.
Make it possible to run benchmarks with the "-graphicssystem" switch.
Add support for running the GraphicsViewBenchmark application manually.
Bump version to 4.6.3.
Fixed a GLX warning that occured with some Intel chipsets under X11.
Fixed compile for maemo6.
Cleanup QEglContext & EGLDisplays
Moved 'hasAlpha' property from GL2 engine to GL paint device.
Remove useless qDebug in QTextCodec autotest
QTextCodec: Symbian has codec for UCS2, only fallback to UTF16 if UCS2 codec cannot be loaded
Add caching to QTextCodec::codecForName and QTextCodec::codecForMib
Add benchmark for QTextCodec
Fix several bugs with GL texture cache
Compile fix for OpenGL ES.
...
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Segoe UI, which is the default ui font on Windows 7, contains the glyph
for a single character in the thai unicode range. This is thus detected
as supporting the Thai script even though it only contains this one
character, and as a result all thai text would appear as boxes on
Windows 7 unless you changed the font. The patch is a temporary hack
to work around the problem until a proper fix can be made.
Reviewed-by: Lars Knoll
|
| | | |
| | |
| | |
| | | |
Reviewed-by: Bjørn Erik Nilsen
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed compile for maemo6.
Cleanup QEglContext & EGLDisplays
Moved 'hasAlpha' property from GL2 engine to GL paint device.
Remove useless qDebug in QTextCodec autotest
QTextCodec: Symbian has codec for UCS2, only fallback to UTF16 if UCS2 codec cannot be loaded
Add caching to QTextCodec::codecForName and QTextCodec::codecForMib
Add benchmark for QTextCodec
Fix several bugs with GL texture cache
Compile fix for OpenGL ES.
Fix missing/outdated license headers.
Turned off subpixel AA text on surface with alpha in GL2 engine.
Add functional Graphics View benchmarks.
Make QCUPSSupport::printerHasPPD() clean up after itself.
document the slowness of QPixmap::hasAlpha()
Speed up custom bitmap brushes on X11 without Xrender support.
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Explicit EGLNativeDisplayType casts are needed since maemo6 defines
EGL_DEFAULT_DISPLAY as ((void*)0).
|
| | | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Cleanup QEglContext & EGLDisplays
Moved 'hasAlpha' property from GL2 engine to GL paint device.
Remove useless qDebug in QTextCodec autotest
QTextCodec: Symbian has codec for UCS2, only fallback to UTF16 if UCS2 codec cannot be loaded
Add caching to QTextCodec::codecForName and QTextCodec::codecForMib
Add benchmark for QTextCodec
Fix several bugs with GL texture cache
Compile fix for OpenGL ES.
Fix missing/outdated license headers.
Turned off subpixel AA text on surface with alpha in GL2 engine.
Add functional Graphics View benchmarks.
Make QCUPSSupport::printerHasPPD() clean up after itself.
document the slowness of QPixmap::hasAlpha()
Speed up custom bitmap brushes on X11 without Xrender support.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This basicaly replaces display(), openDisplay() & defaultDisplay()
methods with a single display() and nativeDisplay(), the latter
being implemented in the platform-specific files and everything
else being cross-platform code.
Reviewed-By: Trond
|
| | | | | |\
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix several bugs with GL texture cache
Compile fix for OpenGL ES.
Fix missing/outdated license headers.
Turned off subpixel AA text on surface with alpha in GL2 engine.
Add functional Graphics View benchmarks.
Make QCUPSSupport::printerHasPPD() clean up after itself.
document the slowness of QPixmap::hasAlpha()
Speed up custom bitmap brushes on X11 without Xrender support.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-By: Trond
Autotest: tst_QGL::qglContextDefaultBindTexture
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This call "leaked" a temporary file in /tmp every time a QPrinter object
was created. Not very nice at all.
Task-number: QTBUG-6419
Reviewed-by: Kim
|
| | | | | | |\ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
There's no need to fall back and go via draw_helper() if we're using
a bitmap brush that's drawn using a solid color.
Task-number: QTBUG-8140
Reviewed-by: Kim
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Kim
|
| | |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (201 commits)
Fix an issue with the error signal in a callWithCallback not being
Add skeleton changes file for 4.6.3.
Fixed compiler warning about making the same class a friend twice
New test cases for the QScriptString.
Fix a deadlock in kqueue implementation of QFileSystemWatcher
Don't crash when QTouchEvent is accepted but not handled by a
QNAM HTTP: Unify socket EOF handling a bit
doc: Added \section1 about serializing operators for Qt collections.
Update the composition demo at 60 FPS instead of at painting rate
Replace the inline blend function by #define
Fix for using QContiguousCache with default constructor or capacity=0
Correctly mark QGraphicsScene::drawItems() as obsolete
Compile fix on Mac with 10.5 sdk.
QTestLib: don't crash if data tag requested, none available
Implement the blend functions with SSE2
doc: Added some since version information.
Ignore touch and gesture events when excluding input events
Implemented GraphicsView Panel support for gestures.
doc: Fixed several typos.
Add MSVC-specific expected failures for JS test suite
...
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
QGraphicsItem
After propagating QEvent::TouchBegin, if there is no item that has
accepted and handled the event, we must remove the touch point from our
data structures.
In this situation, QGraphicsScene will ignore the TouchBegin, as will
QGraphicsView, and QApplication will respond by not sending any more
touch events to the view/scene/item. This means our logic for handling
TouchPointReleased points will never be called (and the QGraphicsScene's
itemForTouchPointId and sceneCurrentTouchPoints state will be
incorrect).
Reviewed-by: Denis Dzyubenko
Reviewed-by: Marius Storm-Olsen
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Some compilers do not inline the functions, which is a problem
because the number of arguments exceed the limit for SSE,
and because it is a lot slower for those low level functions.
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Since the \obsolete was not at the beginning of the function
documentation it was not showing it correctly
Reviewed-by: TrustMe
|
| | | |\ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Compile fix on Mac with 10.5 sdk.
QTestLib: don't crash if data tag requested, none available
Implement the blend functions with SSE2
doc: Added some since version information.
Ignore touch and gesture events when excluding input events
Implemented GraphicsView Panel support for gestures.
doc: Fixed several typos.
Add MSVC-specific expected failures for JS test suite
|
| | | | |\ \ \ \ \
| | | | |/ / / /
| | | |/| | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Compile fix on Mac with 10.5 sdk.
QTestLib: don't crash if data tag requested, none available
Implement the blend functions with SSE2
doc: Added some since version information.
Ignore touch and gesture events when excluding input events
Implemented GraphicsView Panel support for gestures.
doc: Fixed several typos.
Add MSVC-specific expected failures for JS test suite
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: trustme
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
When available, use SSE2 to blend images, computation is
done on 4 pixels at the time instead of 1 with MMX.
Performance improvements:
- Blending ARGB32 on RGB32/ARGB32, mostly opaque: 188%
- Blending ARGB32 on RGB32/ARGB32, no opaque pixels: 180%
- Blending ARGB32 on RGB32/ARGB32, with 0.5 opacity: 187%
- Blending RGB32 on RGB32/ARGB32, with 0.5 opacity: 206%
Reviewed-by: Samuel Rødal
|
| | | | | |\ \ \ \ |
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
When asked to exclude input events when processing events in the event
dispatcher we should also exclude touch and gesture events on Windows and Mac.
Reviewed-by: Bradley T. Hughes
|
| | | | | | |/ / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Events should not propagate outside the panel. Also when delivering gesture
events we should respect panels modality.
Task-number: QTBUG-7451
Reviewed-by: Mikko Harju
Reviewed-by: Bradley T. Hughes
|
| | | | | |/ / /
| | | | | | |
| | | | | | |
| | | | | | | |
Task: QTBUG-7967
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
When debugging or benchmarking changes in QtCore / QtGui, it is
inconvenient to reinstall the whole of Qt.
This allows 'make sis' to generate a partial upgrade sis files,
which can be installed on top of an existing Qt installation.
This relies on binary compatibility, so you should be using def files.
Self-signed partial upgrade can only install on top of self-signed Qt.
Reviewed-by: Miikka Heikkinen
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The bug happened when a paint event came in from Symbian, but the
painted area was bigger than the exposed rect being passed in by
Symbian. In these cases we would lose updates to the area outside.
Fixed by calling Draw() once more if we detect that we painted a
larger area to the backing store.
It is still a mystery why this worked on 5.0 though... :-P
AutoTest: QWidget passed
RevBy: Jason Barron
Task: QTBUG-8200
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Very recent change for QS60Style breaks compilation of the style for
3.1. This is due to that style refers to a skin item ID that is not
existing on 3.1 environment. Fixed by referring to the skin ID with
its internal values.
Task-number: QTBUG-8193
Reviewed-by: TrustMe
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Fix for QTBUG-7258 make itemview margins larger. This broke the
treeviews visually, as indicators are not shown in correct places.
Now, indocators are placed correctly for treeviews as well.
Task-number: QTBUG-7995
Reviewed-by: Alessandro Portale
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Fix for QTBUG-8193 introduced a new enum value into s60style.
Unfortunately, the comma after the value didn't make it into the fix
itself. Adding the comma to allow compilation of style.
Task-number: QTBUG-8193
Reviewed-by: TrustMe
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
QS60Style uses non-square area for scrollbar end graphics areas. It
then tries to scale the areas to make them look like native graphics
(and keeps the width-height ratio), thus squeezing them.
Change style so that scrollbar end areas are squares, just like in
native graphics they are.
Task-number: QTBUG-7996
Reviewed-by: Alessandro Portale
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
When Drag-n-Dropping elements in itemviews QS60Style draws drop area
as a black rect. Change this so that native graphics are used instead.
This change only affects touch-devices as non-touch 3.x devices
do not have the native graphics defined. In 3.x non-touch devices,
style still uses QCommonStyle to draw the DropArea.
Task-number: QTBUG-8193
Reviewed-by: Alessandro Portale
|
| | |/ / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Currently style does not forbid scrollbar context menu, so by default
long pressing over the scrollbar widget shows the context menu. This is
not according to 'S60-style', so from now on the stylehint
SH_ScrollBar_ContextMenu returns false.
Task-number: QTBUG-8194
Reviewed-by: Alessandro Portale
|
| | |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Currently when calculating a button content size, QS60Style has a
variable called buttonWidth, which actually is the width of the
content, not the button itself. Change this to buttonContentWidth.
Reviewed-by: TrustMe
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
tests/auto/qlineedit/tst_qlineedit.cpp
tests/benchmarks/benchmarks.pro
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Enabled searching of IM plugins on Symbian.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
- It will try hbim and coefep first.
- If both are missing (coefep can only be missing if compiled without
S60 support), other plugins in the inputmethods plugin directory
are attempted.
Task: QT-2460
RevBy: Sami Merila
|
| | |\ \ \ \ \ \
| | |/ / / / /
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3410 commits)
Compile fix for OSX.
Make compile. QmlMetaType::isObject() has changed to isQObject().
Fix warnings
Reference count shared expression data
Cleanup public QmlMetaType API
Fix case sensitivity bug in previous commit
Adds inputMethodHint property to TextEdit and TextInput.
Decouple Loader from QmlGraphicsItem
Make test more stable.
Fixed race condition in tst_qmlgraphicswebview::multipleWindows
Explicitly pass size to standard pixmap icon loaders.
Fix qmlgraphicswebview:pixelCache autotest by setting defaults on html
Fixed compile of these recently renamed tests.
Update QmlChanges.txt
Adds qml prefix to all declarative autotests
Removed "running: true" for animations used as propertyvaluesource
Animations are running by default when used as property source value
Fix QmlEngine offlineStoragePath test.
Fix Image test on Windows.
Fix FontLoader test on Windows.
...
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
If no size is passed the pixmaps will always be loaded to determine the
size, wasting memory. This change allows the pixmaps to be loaded lazily.
Reviewed-by: jbache
|
| | | |\ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3397 commits)
Update QmlChanges.txt
Adds qml prefix to all declarative autotests
Removed "running: true" for animations used as propertyvaluesource
Animations are running by default when used as property source value
Fix QmlEngine offlineStoragePath test.
Fix Image test on Windows.
Fix FontLoader test on Windows.
Test should use ceil() not floor() since ceil() is used for calculating
Fix BorderImage tests on Windows.
Test should use ceil() not floor() since ceil() is used for calculating
Clean up
Must pass app arguments onto qExec() or else test system cannot
QML Object toString should use 64-bit address on 64-bit platforms
Improve stability of tst_qmlecmascript::dynamicDestruction
Fix tst_qmlecmascript::callQtInvokables
Fixed qmldebug* tests crashing.
Fix declarative/qmldom::loadDynamicProperty autotest
Fix declarative/animatedimage autotest
Removed the tests/auto/declarative/visual(&examples) from .pro
Add EXPECT_FAIL to js parser tests in declarative ui
...
|
| | | | |\ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3377 commits)
Expect fail.
Expect fails.
Attempt to clairify highlight range docs
Make sure item release isn't deferred indefinately
Expect fail.
Missing file
Exclude plugins example in test.
Test
Crash
Fix tests
Compile.
Remove pathview test.
Remove unneeded
Fix repeater test.
Revert "Remove unimplemented methods from header"
Revert "Replace QList<>* support with QmlListProperty"
Revert "Compile"
Add expected fail and created QTBUG-8072 for qml animation auto-test
Fix expected error message.
Consolidate the two pathview tests and fix them all.
...
|
| | | | | | | | | | |
|
| | | | | |\ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3355 commits)
Get test compiling
Remove unimplemented methods from header
Properly insert objects into the context's object list
Missed a file
Compile
Replace QList<>* support with QmlListProperty
Remove old implicit module support.
Use networkAccessManagerFactory() for worker threads too.
Connect to localhost instead of QHostAddress::Any. Fixes test on Windows.
Support the other validators
Add empty constructor for validators.
Add getter functions to QAbstractDynamicMetaObject and QmlOpenMetaObjectType
Document QtObject
Changed define name to reflect change in Creator.
re-enable QT_USE_FAST_CONCATENATION
XMLHttpRequest collection bug
For local fonts, we can just addApplicationFont() rather than loading data.
The virtual keyboard is now working for TextEdit and TextInput components.
Fix viewport size update.
Make transformOrigin Center by default
...
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Needed to use them in QML. Also adds Q_ENUMS macro for an enum used by
QDoubleValidator.
Reviewed-by: trustme
|
| | | | | | |\ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3324 commits)
Fix test.
Remove hacky fix (breaks autotest).
Fix Behaviors for object-type properties.
Pass symbols::prefix (Action -> QmlAction)
Add license header.
Fix bad merge (compile)
Pass tst_headers::licenseCheck
Fix ListView tests.
Test fixes.
More test fixes.
Clean up QmlImageReader thread on engine destruction.
Update test to handle QmlNetworkAccessManagerFactory
Test fixes.
Add a QEXPECT_FAIL for known bug.
Fix autotest.
Add some painting benchmarks.
Make sure cookies are saved.
Fix headers::licenseCheck autotest failure
Re-add accidentally deleted file
Test SizeItemToLoader to SizeLoaderToItem resizeMode change.
...
|
| | | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Proper fix should be in 4.6 soon.
|
| | | | | | | |\ \ \ \ \
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3309 commits)
Add some painting benchmarks.
Make sure cookies are saved.
Fix headers::licenseCheck autotest failure
Re-add accidentally deleted file
Test SizeItemToLoader to SizeLoaderToItem resizeMode change.
Document QmlContext ownership.
Add bug note.
Fix elision and multilength strings when resizing a Text element.
Document calling C++ methods from QML.
Document margins property
Augment documentation
doc: There is no easeNone, it is called easeLinear
doc: Converted the basic types page to use \qmlbasictype
Focus focusScope from focusing for focusOnPress
Really run image reader in its own thread.
Don't create one QNetworkAccessManager per XMLHttpRequest
We use JavaScript, not ECMAScript.
XMLHttpRequest redirection
update Image.paintedWidth and Image.paintedHeight when the source changes
Remove debug.
...
|
| | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
git://git-nokia.trolltech.com.au/qtsoftware/qt/kinetic
Conflicts:
src/xmlpatterns/type/qprimitives_p.h
tools/linguist/lupdate/main.cpp
|
