qt:qt.git
10 years agoMerge branch 'qtquick2-v8' of scm.dev.nokia.troll.no:qt/qt-script-v8 into qtquick2-v8 history/qtquick2-v8
Olivier Goffart [Wed, 4 May 2011 10:43:20 +0000 (12:43 +0200)]
Merge branch 'qtquick2-v8' of scm.dev.nokia.troll.no:qt/qt-script-v8 into qtquick2-v8

10 years agoMerge remote-tracking branch 'qml/qtquick2' into qtquick2-v8
Olivier Goffart [Wed, 4 May 2011 09:29:42 +0000 (11:29 +0200)]
Merge remote-tracking branch 'qml/qtquick2' into qtquick2-v8

Conflicts:
src/script/api/qscriptengine.cpp
tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp

10 years agoFix a compilation warning.
Jedrzej Nowacki [Wed, 4 May 2011 09:17:50 +0000 (11:17 +0200)]
Fix a compilation warning.

QString::QString(const char* ) is deprecated static QString::fromXXX
function should be used instead.

Reviewed-by: Gabriel de Dietrich
10 years agoPerformance fix for QScriptString.
Jedrzej Nowacki [Thu, 7 Apr 2011 08:00:30 +0000 (10:00 +0200)]
Performance fix for QScriptString.

QScritpString should use symbols as an implementation to increase chance
to hit fast cases, for example for equals algorithm.

Reviewed-by: Caio Marcelo de Oliveira Filho
10 years agoFix missing Isolate.
Jedrzej Nowacki [Mon, 2 May 2011 13:38:14 +0000 (15:38 +0200)]
Fix missing Isolate.

QScriptConnection methods can be called directly from QtMetaSystem
(as a result of signal or delete operator) which means that they need
to be protected by Isolate.

Reviewed-by: Caio Marcelo de Oliveira Filho
10 years agosrc/3rdparty cleanup.
Jedrzej Nowacki [Mon, 2 May 2011 17:02:50 +0000 (19:02 +0200)]
src/3rdparty cleanup.

We do not use javascriptcore for QtScript anymore.

Reviewed-by: TrustMe
10 years agoExpose v8::String::Hash() and v8::String::Equals()
Kent Hansen [Tue, 7 Dec 2010 10:13:23 +0000 (11:13 +0100)]
Expose v8::String::Hash() and v8::String::Equals()

10 years agoExpose the script id from StackFrame.
Jedrzej Nowacki [Mon, 14 Mar 2011 11:41:44 +0000 (12:41 +0100)]
Expose the script id from StackFrame.

Currently V8 API use two ways for a script recognition;
- script file name
- id
The first one is not unique and the second is accessible only from
v8::Script object which makes it unusable.

This patch exposes script id from frame so we can do deterministic
association between them.

10 years agoQtScript/V8: Add new v8 api to check if a value is an error.
Jedrzej Nowacki [Tue, 7 Dec 2010 10:56:42 +0000 (11:56 +0100)]
QtScript/V8: Add new v8 api to check if a value is an error.

New function v8::Value::IsError was created.

This API is experimental and added only for the purposes of our
research.

10 years agov8: add a way for a thread to call a callback
Olivier Goffart [Mon, 14 Mar 2011 12:54:58 +0000 (13:54 +0100)]
v8: add a way for a thread to call a callback

The callback will be called as soon as possible from the main thread.

10 years agov8: Fix the script name and line number in CompileEval
Olivier Goffart [Mon, 31 Jan 2011 10:20:53 +0000 (11:20 +0100)]
v8: Fix the script name and line number in CompileEval

Add a way to register the script name and the line/column offset
in CompileEval

10 years agov8: add a way to call an object function handler as constructor
Caio Marcelo de Oliveira Filho [Mon, 14 Mar 2011 12:56:32 +0000 (13:56 +0100)]
v8: add a way to call an object function handler as constructor

This commit implements the Object::NewInstance() method, which allow
us call the object as a constructor (equivalent to "new obj()"). This
is done by _calling_ the function returned from GetConstructorDelegate().

Note that like v8, we don't implement the thisObject creation for
non-function objects called as constructors. The Qt code does that in
the handler itself when called as constructor. This is not ideal but
reduce the depth of changes in v8 code.

Reviewed-by: Olivier Goffart
10 years agoImplement QScriptContext::setActivationObject
Olivier Goffart [Mon, 31 Jan 2011 10:22:26 +0000 (11:22 +0100)]
Implement QScriptContext::setActivationObject

10 years agoQScript: Make sure the 'this' is correct
Olivier Goffart [Mon, 31 Jan 2011 10:20:17 +0000 (11:20 +0100)]
QScript: Make sure the 'this' is correct

This is to fix the tst_QScriptEngine::nestedEvaluate

10 years agov8: Add Api to call objects
Kent Hansen [Tue, 7 Dec 2010 10:52:11 +0000 (11:52 +0100)]
v8: Add Api to call objects

10 years agoQtScript/V8: Add API for compiling script in current context
Kent Hansen [Tue, 7 Dec 2010 10:15:12 +0000 (11:15 +0100)]
QtScript/V8: Add API for compiling script in current context

v8::Script::Compile() will compile the script in the _global_
context. In order to achieve correct semantics for
QScriptEngine::evaluate(), we need a function that compiles
the script in the _current_ (inner) context.

This API is experimental and added only for the purposes of
our research.

10 years agoQtScript/V8: Add API for manipulating scope and function contexts
Kent Hansen [Tue, 7 Dec 2010 10:14:45 +0000 (11:14 +0100)]
QtScript/V8: Add API for manipulating scope and function contexts

Needed for the implementation of QScriptEngine::{push,pop}Context(),
QScriptContext::{push,pop}Scope() and friends.

This API is experimental and added only for the purpose of our
research.

The upstream v8 API only provides access to global context objects.
Internally, there are two other types of context objects:
FunctionContexts, used to implement closures, and WithContexts,
used to implement JS "with" statements. The API added in this
change provides a way to construct and access such context objects
from C++.

10 years agoUpdated v8 from /home/nierob/dev/v8-tmp/ to v8-snapshot-05042011
Jedrzej Nowacki [Tue, 5 Apr 2011 14:05:28 +0000 (16:05 +0200)]
Updated v8 from /home/nierob/dev/v8-tmp/ to v8-snapshot-05042011

From eab749c43efba1fdd862dd1f3a4faceddf1c8d8f from v8 bleeding_edge
branch revision r7501.

10 years agoUpdate mkdist-v8 script after merge of isolate branch into trunk.
Jedrzej Nowacki [Tue, 5 Apr 2011 11:06:18 +0000 (13:06 +0200)]
Update mkdist-v8 script after merge of isolate branch into trunk.

10 years agoImplement qScriptConnect(), qScriptDisconnect()
Gabriel de Dietrich [Wed, 6 Apr 2011 11:09:56 +0000 (13:09 +0200)]
Implement qScriptConnect(), qScriptDisconnect()

These functions are currently being used by QDeclarative. Needed for
tst_qdeclarativeecmascript.

The semantics are stricter than what the documentation suggests. When
calling qScriptDisconnect(), the connection must have been be made
with qScriptConnect().

Reviewed-by: Olivier
10 years agoQDeclarativeObjectScriptClass: do not handle valueOf()
Caio Marcelo de Oliveira Filho [Tue, 26 Apr 2011 21:16:32 +0000 (18:16 -0300)]
QDeclarativeObjectScriptClass: do not handle valueOf()

The obj.valueOf() is called in situations that we convert an object to
a number. It is called implicitly by V8 (see DefaultNumber() in
runtime.js for example), and when it hits our ScriptClass code the
frame doesn't look like the way we expect (no DeclarativeContext
available in the Caller scope chain).

The problem happen in callQtInvokables, in tests that expect
numbers and we pass the an object instead.

This was the only case I've found which v8::Context::GetCallerContext
(an extension in our branch of v8) isn't enough for the purpose of
providing the top context in the previous frame. Avoiding valueOf() is
OK for now.

Last but not least, tst_qdeclarativeecmascript does not segfault anymore.

Reviewed-by: Olivier Goffart
10 years agoQDeclarativeEnginePrivate: fix and encapsulate the usage of scopeChainValue
Caio Marcelo de Oliveira Filho [Tue, 12 Apr 2011 21:23:02 +0000 (18:23 -0300)]
QDeclarativeEnginePrivate: fix and encapsulate the usage of scopeChainValue

Reduce the places that we make a direct reference to the
scopeChainValue (and the "-3" position) by providing a higher level
function that gets the scopeNode of the Declarative Context that
is in the current execution.

This commit also fixes the offset of the wanted nodes in the scope
chain. In the long term we still need to get rid of this scope chain
direct manipulation if possible.

Reviewed-by: Olivier Goffart
10 years agoQScriptContext: present the scopes in reverse order
Caio Marcelo de Oliveira Filho [Tue, 26 Apr 2011 18:45:44 +0000 (15:45 -0300)]
QScriptContext: present the scopes in reverse order

The object in the last call for pushScope() should be the first one
in the scopeChain() list.

Reviewed-by: Olivier Goffart
10 years agov8: make GetPrevious work for function contexts
Caio Marcelo de Oliveira Filho [Tue, 26 Apr 2011 18:41:54 +0000 (15:41 -0300)]
v8: make GetPrevious work for function contexts

The "previous context" for a function context is stored inside the
closure(). The inspiration for this came from
v8::internal::Context::Lookup().

Reviewed-by: Olivier Goffart
10 years agoMerge branch 'master' into qtquick2 history/qtquick2
axis [Wed, 27 Apr 2011 10:59:51 +0000 (12:59 +0200)]
Merge branch 'master' into qtquick2

10 years agoMerge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Olivier Goffart [Wed, 27 Apr 2011 09:27:52 +0000 (11:27 +0200)]
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/opengl/qwindowsurface_gl.cpp
src/s60installs/eabi/QtGuiu.def

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Wed, 27 Apr 2011 05:43:57 +0000 (15:43 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Ignore changes to selectByMouse during a selection.
  PathView offset out of sync with currentIndex when items are removed.

10 years agoIgnore changes to selectByMouse during a selection.
Andrew den Exter [Wed, 27 Apr 2011 03:57:04 +0000 (13:57 +1000)]
Ignore changes to selectByMouse during a selection.

Use the value of selectByMouse at the time of a mouse press event in
all subsequent mouse events in a sequence.  This is the same as
ignoring the intial mouse press except mouse events for other actions
are still accepted.

Change-Id: I59b50bf95d26c6320e6e74eeb679b4153e0edf4d
Task-number: QTBUG-18887
Reviewed-by: Martin Jones
10 years agoPathView offset out of sync with currentIndex when items are removed.
Martin Jones [Wed, 27 Apr 2011 03:10:34 +0000 (13:10 +1000)]
PathView offset out of sync with currentIndex when items are removed.

If the view is animating due to currentIndex change and items are
removed the target offset must be recalculated.

Change-Id: Iee105712488070c086a24561a49daf17bcf14076
Task-number: QTBUG-18825
Reviewed-by: Michael Brasser
10 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Wed, 27 Apr 2011 02:04:40 +0000 (12:04 +1000)]
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  Set QPixmapCache default limit to 10MB on Symbian.

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Wed, 27 Apr 2011 01:47:10 +0000 (11:47 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Move the TextInput cursor delegate when the preedit position changes.

10 years agoMove the TextInput cursor delegate when the preedit position changes.
Andrew den Exter [Wed, 27 Apr 2011 01:16:04 +0000 (11:16 +1000)]
Move the TextInput cursor delegate when the preedit position changes.

Change-Id: Ia7150122444e465ffbcc02e921d42d01c2dfdac1
Task-number: QTBUG-18892
Reviewed-by: Martin Jones
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Tue, 26 Apr 2011 17:48:55 +0000 (03:48 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Add new exported symbol to QtGuiu.def
  Handle uppercase 'E' when parsing numbers in SVGs.
  Let QTextLine decide its own x position in QPainter
  Support text decoration in QML when using static text back-end
  Fix missing color in text when using static text back-end in QML

10 years agoMerge branch 4.7 into qt-4.8-from-4.7
Qt Continuous Integration System [Tue, 26 Apr 2011 16:06:10 +0000 (02:06 +1000)]
Merge branch 4.7 into qt-4.8-from-4.7

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Tue, 26 Apr 2011 13:49:59 +0000 (23:49 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Input method hints are not correct if using proxy widget
  Fix for GL graphcics system orientation which
  Update Symbian platform notes documentation

10 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qt-qml-team into qtquick2
axis [Tue, 26 Apr 2011 13:36:00 +0000 (15:36 +0200)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qt-qml-team into qtquick2

10 years agoAdd qdoc label to QSGContext
Gunnar Sletta [Tue, 26 Apr 2011 13:26:56 +0000 (15:26 +0200)]
Add qdoc label to QSGContext

10 years agoAdd new exported symbol to QtGuiu.def
Eskil Abrahamsen Blomfeldt [Tue, 26 Apr 2011 13:06:32 +0000 (15:06 +0200)]
Add new exported symbol to QtGuiu.def

Fix build on Symbian

Reviewed-by: Jason Barron
10 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qt-qml-team into qtquick2
axis [Tue, 26 Apr 2011 13:10:40 +0000 (15:10 +0200)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qt-qml-team into qtquick2

10 years agoUpdate SceneGraph to use QRawFont API
Eskil Abrahamsen Blomfeldt [Thu, 14 Apr 2011 16:16:18 +0000 (18:16 +0200)]
Update SceneGraph to use QRawFont API

Necessary changes to compile and work with changes to QGlyphs API

10 years agoFixed item transforms in Scene Graph to match GraphicsView.
Kim Motoyoshi Kalland [Tue, 26 Apr 2011 12:00:35 +0000 (14:00 +0200)]
Fixed item transforms in Scene Graph to match GraphicsView.

10 years agoInput method hints are not correct if using proxy widget
Sami Merila [Tue, 26 Apr 2011 11:58:34 +0000 (14:58 +0300)]
Input method hints are not correct if using proxy widget

Input context should prefer focus proxy over regular focus widget.

Task-number: QTBUG-18873
Reviewed-by: Miikka Heikkinen
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt into qtquick2
axis [Tue, 26 Apr 2011 11:48:26 +0000 (13:48 +0200)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into qtquick2

Conflicts:
src/declarative/debugger/qdeclarativedebugserver.cpp
src/gui/text/qfontengine_ft_p.h
tests/auto/declarative/declarative.pro
tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp

10 years agoFix for GL graphcics system orientation which
Jani Hautakangas [Thu, 21 Apr 2011 11:07:09 +0000 (14:07 +0300)]
Fix for GL graphcics system orientation which

OpenGL context needs to be recreated on Symbian
when orientation changes. Previously only the EGL
surface was recreated which wasn't enough.

Task-number: QTBUG-18850
Reviewed-by: Samuel Rødal
10 years agoUpdate Symbian platform notes documentation
Jani Hautakangas [Fri, 15 Apr 2011 07:55:48 +0000 (10:55 +0300)]
Update Symbian platform notes documentation

Task-number: QTBUG-17357
Reviewed-by: Jason Barron
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Tue, 26 Apr 2011 07:35:03 +0000 (17:35 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Set QPixmapCache default limit to 10MB on Symbian.

10 years agoSet QPixmapCache default limit to 10MB on Symbian.
Jani Hautakangas [Thu, 21 Apr 2011 11:11:01 +0000 (14:11 +0300)]
Set QPixmapCache default limit to 10MB on Symbian.

Cache limit can be changed to 10MB since QPixmaps
on Symbian are not consuming process heap anymore.
QPixmaps are reserved from FBServ heap.

Task-number: QTBUG-18568
Reviewed-by: Laszlo Agocs
10 years agoadded missing file
Gunnar Sletta [Tue, 26 Apr 2011 06:43:02 +0000 (08:43 +0200)]
added missing file

10 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qt-qml-team into qtquick2
Gunnar Sletta [Tue, 26 Apr 2011 05:25:16 +0000 (07:25 +0200)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qt-qml-team into qtquick2

10 years agoUse higher opacity for QML_TRANSLUCENT_MODE
Gunnar Sletta [Tue, 26 Apr 2011 05:24:31 +0000 (07:24 +0200)]
Use higher opacity for QML_TRANSLUCENT_MODE

10 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Fri, 22 Apr 2011 16:14:11 +0000 (02:14 +1000)]
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  Document section behavior when not ordered by section
  Fix TextInput cursor position unchanged when selection length is 0.
  Fix TextInput echoMode clearing inputMethodHints set by the user.
  Elide has unexpected effect on Text's implicitWidth

10 years agoMerge branch 4.7 into qt-4.8-from-4.7
Qt Continuous Integration System [Fri, 22 Apr 2011 16:04:19 +0000 (02:04 +1000)]
Merge branch 4.7 into qt-4.8-from-4.7

10 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Thu, 21 Apr 2011 16:42:52 +0000 (02:42 +1000)]
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  remove exec bit ... again ...
  Add Korean translation
  QDeclarativeDebug: Fix typo in warning
  QDeclarativeDebug: Fix endless loop for property with SCRITABLE false
  Fix Symbian/Linux compilation breakage in plugins/qmltooling
  Build break fix for simulated QS60Style
  fix unititialized value use when timestamping qconfig.h
  Drift correction and better accuracy for repeating timers in Symbian
  Make QMLViewer startup animation stop after a while
  Fix excessive scrolling in TextInput with mid string pre-edit text.

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 21 Apr 2011 13:18:20 +0000 (23:18 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Document section behavior when not ordered by section
  Fix TextInput cursor position unchanged when selection length is 0.
  Fix TextInput echoMode clearing inputMethodHints set by the user.
  Elide has unexpected effect on Text's implicitWidth

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 21 Apr 2011 12:33:24 +0000 (22:33 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Use binary search to speed up findChildFrame()

10 years agoMerge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Olivier Goffart [Thu, 21 Apr 2011 11:12:18 +0000 (13:12 +0200)]
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/plugins/qmltooling/qmldbg_ost/qostdevice.h

10 years agoMerge remote-tracking branch 'mainline/master'
Oswald Buddenhagen [Thu, 21 Apr 2011 09:45:03 +0000 (11:45 +0200)]
Merge remote-tracking branch 'mainline/master'

10 years agoUse binary search to speed up findChildFrame()
Steffen Hansen [Wed, 20 Apr 2011 10:45:42 +0000 (12:45 +0200)]
Use binary search to speed up findChildFrame()

Merge-request: 2595
Reviewed-by: mae
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 21 Apr 2011 07:40:12 +0000 (17:40 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Build break fix for simulated QS60Style
  Drift correction and better accuracy for repeating timers in Symbian

10 years agoDocument section behavior when not ordered by section
Martin Jones [Thu, 21 Apr 2011 06:17:46 +0000 (16:17 +1000)]
Document section behavior when not ordered by section

Change-Id: Id0345d477c253a5dd54306b06dae1df971ec76fc
Task-number: QTBUG-17757
Reviewed-by: Bea Lam
10 years agoadd call conventions for all gl functions
Charles Yin [Thu, 21 Apr 2011 05:24:28 +0000 (15:24 +1000)]
add call conventions for all gl functions

Change-Id: I43a5c20bb683369c20280c9622d04c285a9cb86f

10 years agoFix TextInput cursor position unchanged when selection length is 0.
Andrew den Exter [Tue, 19 Apr 2011 05:11:36 +0000 (15:11 +1000)]
Fix TextInput cursor position unchanged when selection length is 0.

Move the cursor position to the start position when both the new and
old selections are empty as would happen if either was non-empty.

Change-Id: I493e52c551b47e009fd13b3e95856ff012ee5d95
Task-number: QTBUG-18768
Reviewed-by: Martin Jones
10 years agoFix TextInput echoMode clearing inputMethodHints set by the user.
Andrew den Exter [Tue, 19 Apr 2011 04:00:48 +0000 (14:00 +1000)]
Fix TextInput echoMode clearing inputMethodHints set by the user.

Changing to the Normal echo mode from another mode clears the
NoPredictiveText and NoAutoUppercase flags, irrespective of who
originally set them.  Add separate accessors for the property value
so echo mode can overwrite the authoritive value without losing the
value set in QML.

Change-Id: I6a9563057bb17796b17ac7c2a3c564bb5e886c4d
Task-number: QTBUG-18735
Reviewed-by: Martin Jones
10 years agoElide has unexpected effect on Text's implicitWidth
Martin Jones [Thu, 21 Apr 2011 04:15:38 +0000 (14:15 +1000)]
Elide has unexpected effect on Text's implicitWidth

The elided string was used to calculate the implicitWidth rather than
the full string.

Change-Id: I51b8800b47d4e32f4d5eef07c71df10e2df905b7
Task-number: QTBUG-18627
Reviewed-by: Michael Brasser
10 years agoFix spelling mistakes
Alan Alpert [Thu, 21 Apr 2011 05:05:25 +0000 (15:05 +1000)]
Fix spelling mistakes

Change-Id: I7e3429e4cf224915217b141219e3f0626887da2d

10 years agoFix PictureAffector's onceOff property
Alan Alpert [Thu, 21 Apr 2011 04:07:22 +0000 (14:07 +1000)]
Fix PictureAffector's onceOff property

Change-Id: I9de8c144dae48b1f5da9c674c62638311383eb5d

10 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qt-qml-team into qtquick2
Alan Alpert [Thu, 21 Apr 2011 04:04:07 +0000 (14:04 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qt-qml-team into qtquick2

10 years agoAugment FollowEmitter
Alan Alpert [Thu, 21 Apr 2011 04:03:28 +0000 (14:03 +1000)]
Augment FollowEmitter

Now has separate shapes for its area and the particle emission area

Change-Id: I9d1aa78da9619732abe38188489f0fda53d1255a

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 21 Apr 2011 03:54:51 +0000 (13:54 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  QDeclarativeDebug: Fix typo in warning

10 years agoFix xmlhttprequest send_withdata() auto test failure
Bea Lam [Thu, 21 Apr 2011 00:42:20 +0000 (10:42 +1000)]
Fix xmlhttprequest send_withdata() auto test failure

TestHTTPServer was sending a message body in response to the HEAD
request in the preceding send_ignoreData() test, which it shouldn't
have and meant the request finished but there were still bytes
available, so any following test on the same port would fail.

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Wed, 20 Apr 2011 22:16:08 +0000 (08:16 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  remove exec bit ... again ...
  Add Korean translation
  fix unititialized value use when timestamping qconfig.h

10 years agoMerge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Wed, 20 Apr 2011 19:12:17 +0000 (05:12 +1000)]
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (69 commits)
  Fix compilation with symbian-armcc
  Updated Russian translation
  Ukrainian translation updated
  Fix wrong merge of 3aa39b0164ce4bb9e
  Symbol table is very limited in numeric input mode
  Fix build of Qt/DirectFB without graphics view support.
  Add new QSysInfo::symbianVersion() enums
  QDesktopServices::openUrl() doesn't handle URL encodings correctly
  Build fix for transition effect support on S60 5.0.
  Make EGL surface transparency working on Symbian.
  QmlDebug: Fix license headers in new ost plugin
  Fixed autotest after b4b85257ccff6ba21bcbcbd46a9f7f09884abe79
  Resolve unqualified attached properties correctly
  Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Symbian.
  QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp'
  QDeclarativeDebug: Don't crash when connection is closed
  Splitview flag should also be updated to inputcontext
  QGraphicsView with vertical scrollbar flickers when splitview opens
  Splitview: opening a context menu should not re-position of focusItem
  Trigger fullscreen transition effects properly on app exit.
  ...

10 years agoremove exec bit ... again ...
Oswald Buddenhagen [Wed, 20 Apr 2011 16:54:28 +0000 (18:54 +0200)]
remove exec bit ... again ...

10 years agoAdd Korean translation
Park Shinjo [Wed, 20 Apr 2011 16:44:59 +0000 (18:44 +0200)]
Add Korean translation

Merge-request: 1021
Reviewed-by: ossi
10 years agoMerge branch 4.7 into qt-master-from-4.7
Qt Continuous Integration System [Wed, 20 Apr 2011 16:04:48 +0000 (02:04 +1000)]
Merge branch 4.7 into qt-master-from-4.7

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Wed, 20 Apr 2011 14:09:31 +0000 (00:09 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (198 commits)
  QNetworkCookie: do not access date string out of bounds
  Fix compile error with QT_NO_OPENSSL
  Fix qfile autotest hanging in CI system
  Revert "QNativeWifiEngine: Fix problem with wifi polling on Windows"
  QSslConfiguration: fix equals operator
  HTTP+SSL: use default SSL configuration, and avoid setting it explctly
  QLocale: Fixed double to currency string conversion on Mac.
  QNativeWifiEngine: Fix problem with wifi polling on Windows
  Applying the QTBUG-17986 fix to Symbian
  Added support for libICU for collation and toLower/toUpper.
  Fix regression with Qt::AutoConnection
  Revert "HTTP caching internals: fix logic for PreferNetwork and PreferCache"
  Implement support for sockets started before the event loop
  QUdpSocket autotest updates
  tst_qnetworkreply: skip ioGetFromBuiltinHttp test.
  tst_qtcpserver: Add a mapped v4 addr test
  QHostInfo autotest fixes related to symbian
  QHostInfo symbian backend finalisation
  Add autotests for QHostInfo::abortHostLookup
  Updating comment in QHostInfo::localDomainName
  ...

10 years agoQDeclarativeDebug: Fix typo in warning
Kai Koehne [Wed, 20 Apr 2011 14:06:48 +0000 (16:06 +0200)]
QDeclarativeDebug: Fix typo in warning

Add missing space to make the warning align with the others. Fix is needed
to let QtCreator detect the warning programatically.

Reviewed-by: Tom Sutcliffe
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Wed, 20 Apr 2011 13:24:42 +0000 (23:24 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  QDeclarativeDebug: Fix endless loop for property with SCRITABLE false
  Fix Symbian/Linux compilation breakage in plugins/qmltooling
  Make QMLViewer startup animation stop after a while
  Fix excessive scrolling in TextInput with mid string pre-edit text.

10 years agoQDeclarativeDebug: Fix endless loop for property with SCRITABLE false
Kai Koehne [Wed, 20 Apr 2011 12:16:03 +0000 (14:16 +0200)]
QDeclarativeDebug: Fix endless loop for property with SCRITABLE false

Trying to read a property marked as non-scriptable results in an
endless loop in QDeclarativePropertyCache::create .

Task-number: QTBUG-18758
Reviewed-by: Aaron Kennedy
10 years agoFix Symbian/Linux compilation breakage in plugins/qmltooling
Kai Koehne [Wed, 20 Apr 2011 12:01:25 +0000 (14:01 +0200)]
Fix Symbian/Linux compilation breakage in plugins/qmltooling

use QIODevice header file instead of (wrongly capitablized) QIODevice.h

Reviewed-by: Tom Sutcliffe
Task-number: QTBUG-18869

10 years agoHandle uppercase 'E' when parsing numbers in SVGs.
Kim Motoyoshi Kalland [Wed, 20 Apr 2011 10:34:40 +0000 (12:34 +0200)]
Handle uppercase 'E' when parsing numbers in SVGs.

Task-number: QT-4881
Reviewed-by: Samuel
10 years agoBuild break fix for simulated QS60Style
Sami Merila [Wed, 20 Apr 2011 11:57:51 +0000 (14:57 +0300)]
Build break fix for simulated QS60Style

Recent changes in QS60Style (to support placeholder background texture)
causes the simulated style not to build. The implementation
for new method placeHolderTexture() is on the Symbian-specific
sourcefile, which is omitted in the simulator builds.

As a fix, move the implementation to the "generic" style source
file qs60style.cpp, since the method does not contain any
Symbian specific code.

Task-number: QTBUG-18863
Reviewed-by: owolff
10 years agoMerge remote-tracking branch 'earth-team/master' into earth-staging-master
Olivier Goffart [Wed, 20 Apr 2011 10:52:58 +0000 (12:52 +0200)]
Merge remote-tracking branch 'earth-team/master' into earth-staging-master

10 years agofix unititialized value use when timestamping qconfig.h
Darryl L. Miles [Wed, 20 Apr 2011 10:39:09 +0000 (12:39 +0200)]
fix unititialized value use when timestamping qconfig.h

we may be creating the forwarding header for a not yet existing file, so
the timestamp may be undefined.

Task-number: QTBUG-15330
Merge-request: 1174
Reviewed-by: ossi
10 years agoDrift correction and better accuracy for repeating timers in Symbian
mread [Wed, 20 Apr 2011 09:02:16 +0000 (10:02 +0100)]
Drift correction and better accuracy for repeating timers in Symbian

Timers on Symbian were always firing at least 2ms late. This was partly
due to a paranoid extra delay in Qt and the kernel being very cautious.

For one shot timers this is not so bad although a bit too much. But for
repeating timers, this can cause significant reductions in firing rate
particularly for short period timers.

The timer active object now corrects timer lateness by up to 4ms per
event. This is enough to compensate for the kernel lateness without
the possibility of wild corrections.

Task-number: QTBUG-18549
Reviewed-by: iain
10 years agoQNetworkCookie: do not access date string out of bounds
Peter Hartmann [Tue, 19 Apr 2011 09:38:06 +0000 (11:38 +0200)]
QNetworkCookie: do not access date string out of bounds

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Wed, 20 Apr 2011 06:52:51 +0000 (16:52 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Updated Russian translation
  Ukrainian translation updated

10 years agoqmlplugindump: Use command line options with a single dash.
Christian Kamm [Tue, 19 Apr 2011 12:24:35 +0000 (14:24 +0200)]
qmlplugindump: Use command line options with a single dash.

Keep the old -- options for compatibility.

Change-Id: I9c9b0beccc7043cf8b4b654bdba33946abf8c7b6
Task-number: QTBUG-18834

10 years agoAdd actual picture affector files
Alan Alpert [Wed, 20 Apr 2011 04:58:07 +0000 (14:58 +1000)]
Add actual picture affector files

Change-Id: Iace13293cdc90fd15731a0a164783ee5bd6ddf6e

10 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qt-qml-team into qtquick2
Alan Alpert [Wed, 20 Apr 2011 04:41:59 +0000 (14:41 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qt-qml-team into qtquick2

10 years agoAdd PictureAffector
Alan Alpert [Wed, 20 Apr 2011 04:41:12 +0000 (14:41 +1000)]
Add PictureAffector

Changes colors to fit a picture.
Also added rotationVariation to DeformableParticle

Change-Id: I31b82328b5ac0348cfddc55acae0f5b78f4b55d2

10 years agoAdd closure scope autotests
Aaron Kennedy [Wed, 20 Apr 2011 04:05:07 +0000 (14:05 +1000)]
Add closure scope autotests

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 20 Apr 2011 02:15:52 +0000 (12:15 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Symbol table is very limited in numeric input mode

10 years agoMake QMLViewer startup animation stop after a while
Alan Alpert [Tue, 19 Apr 2011 22:08:41 +0000 (08:08 +1000)]
Make QMLViewer startup animation stop after a while

Task-number: QTBUG-18621

10 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qt-qml-team into qtquick2
Alan Alpert [Tue, 19 Apr 2011 21:56:37 +0000 (07:56 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qt-qml-team into qtquick2

10 years agoMake startup animation in qmlviewer not infinite
Alan Alpert [Tue, 19 Apr 2011 21:55:49 +0000 (07:55 +1000)]
Make startup animation in qmlviewer not infinite

Change-Id: I19ff131b2998da84e2fdd5dce94f3449400ae531
Task-number: QTBUG-18621

10 years agoFix compilation with symbian-armcc
Olivier Goffart [Tue, 19 Apr 2011 18:27:06 +0000 (20:27 +0200)]
Fix compilation with symbian-armcc

the case of the headers matter if you compile on linux

Reviewed-by: Marius Storm-Olsen
10 years agoMerge branch 4.7 into qt-master-from-4.7
Qt Continuous Integration System [Tue, 19 Apr 2011 16:03:31 +0000 (02:03 +1000)]
Merge branch 4.7 into qt-master-from-4.7

10 years agoMerge remote branch 'lighthouse/master' into qtquick2
Samuel Rødal [Tue, 19 Apr 2011 14:53:20 +0000 (16:53 +0200)]
Merge remote branch 'lighthouse/master' into qtquick2

10 years agoAdded missing function in QWaylandWindow.
Samuel Rødal [Tue, 19 Apr 2011 14:48:57 +0000 (16:48 +0200)]
Added missing function in QWaylandWindow.