qt:digia-qt.git
6 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

6 years agoMerge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 master
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

6 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.

6 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
6 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
6 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.

6 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.

6 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
6 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

6 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

6 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

6 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

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

6 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
6 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

6 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

6 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.

6 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
6 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

6 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
6 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
6 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.

6 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
6 years agoadded missing file
Gunnar Sletta [Tue, 26 Apr 2011 06:43:02 +0000 (08:43 +0200)]
added missing file

6 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

6 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

6 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

6 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

6 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.

6 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

6 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()

6 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

6 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'

6 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
6 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

6 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
6 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

6 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
6 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
6 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
6 years agoFix spelling mistakes
Alan Alpert [Thu, 21 Apr 2011 05:05:25 +0000 (15:05 +1000)]
Fix spelling mistakes

Change-Id: I7e3429e4cf224915217b141219e3f0626887da2d

6 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

6 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

6 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

6 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

6 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.

6 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

6 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.
  ...

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

6 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
6 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

6 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
  ...

6 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
6 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.

6 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
6 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

6 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
6 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
6 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

6 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
6 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
6 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

6 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

6 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

6 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

6 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

6 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

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

6 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

6 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

6 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

6 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

6 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
6 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

6 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

6 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.

6 years agoUpdated Russian translation
Sergey Belyashov [Tue, 19 Apr 2011 14:12:18 +0000 (16:12 +0200)]
Updated Russian translation

Merge-request: 2596
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 years agowayland: Drop a debug qWarning()
Kristian Høgsberg [Tue, 19 Apr 2011 12:07:05 +0000 (08:07 -0400)]
wayland: Drop a debug qWarning()

6 years agowayland: Discard motion and button events receive with a NULL pointer focus
Kristian Høgsberg [Tue, 19 Apr 2011 12:05:51 +0000 (08:05 -0400)]
wayland: Discard motion and button events receive with a NULL pointer focus

If we destroy a surface we NULL out mPointerFocus and mKeyboardFocus
pointers, but the server may still send a few events out before it
receives the destroy request.  Discard such events.

6 years agowayland: Include eglconvenience.pri instead of pulling in individual file
Kristian Høgsberg [Tue, 19 Apr 2011 12:01:29 +0000 (08:01 -0400)]
wayland: Include eglconvenience.pri instead of pulling in individual file

6 years agowayland: Remove unused EGLConfig field
Kristian Høgsberg [Tue, 19 Apr 2011 11:58:21 +0000 (07:58 -0400)]
wayland: Remove unused EGLConfig field

6 years agowayland: Add native access interface for Wayland plugin
Kristian Høgsberg [Tue, 19 Apr 2011 11:57:39 +0000 (07:57 -0400)]
wayland: Add native access interface for Wayland plugin

6 years agoFix compile error with QT_NO_OPENSSL
Shane Kearns [Tue, 19 Apr 2011 13:37:05 +0000 (14:37 +0100)]
Fix compile error with QT_NO_OPENSSL

6 years agoFix qfile autotest hanging in CI system
Shane Kearns [Tue, 19 Apr 2011 11:15:21 +0000 (12:15 +0100)]
Fix qfile autotest hanging in CI system

The test machine is configured to pop up dialogs in case of CRT
assertion failures. The CRT has a debug assert whenever an invalid
file handle is used, while the test is expecting to get the EBADF
return code.
Due to some behaviour change in windows 7 (maybe SP1), we need to
call _CrtSetReportMode in addition to setting an error handler.

Reviewed-By: mread
6 years agoUkrainian translation updated
Victor Ostashevsky [Tue, 19 Apr 2011 11:43:39 +0000 (13:43 +0200)]
Ukrainian translation updated

Merge-request: 1189
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 years agoFix wrong merge of 3aa39b0164ce4bb9e
Olivier Goffart [Tue, 19 Apr 2011 10:05:48 +0000 (12:05 +0200)]
Fix wrong merge of 3aa39b0164ce4bb9e

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Tue, 19 Apr 2011 08:56:03 +0000 (18:56 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
  Make sure #ifdef'd tests still have main() function
  Long live QRawFont!

6 years agoLet QTextLine decide its own x position in QPainter
Jiang Jiang [Thu, 24 Mar 2011 12:33:31 +0000 (13:33 +0100)]
Let QTextLine decide its own x position in QPainter

So that it can take trailing space width into account when
doing right aligned text drawing.

Backported from master.

Task-number: QTBUG-18303
Reviewed-by: Eskil
6 years agoMake sure #ifdef'd tests still have main() function
Eskil Abrahamsen Blomfeldt [Mon, 18 Apr 2011 07:51:13 +0000 (09:51 +0200)]
Make sure #ifdef'd tests still have main() function

Otherwise it won't link on QWS

Reviewed-by: TrustMe
6 years agoLong live QRawFont!
Eskil Abrahamsen Blomfeldt [Tue, 22 Mar 2011 09:57:59 +0000 (10:57 +0100)]
Long live QRawFont!

The QGlyphs API was initially attempted with a bastardization of
QFont which was meant to encapsulate a single, physical font
instance (a QFontEngine) where a set of glyph indexes would make
sense. This is not how QFont was intended to be used, and it caused
several issues. At the same time, the requirement for loading a
font from ttf/otf data and be able to access it and use it without
polluting the rest of the process with the font arose. To support
these two APIs we introduce QRawFont, which is an abstraction on
top of a single physical font.

Done-with: Jiang Jiang

6 years agoAdd DeformableParticle
Alan Alpert [Tue, 19 Apr 2011 02:52:54 +0000 (12:52 +1000)]
Add DeformableParticle

Change-Id: Id7473a0fc2276193bf5cbac997003b81df6e4fc1

6 years agoFix excessive scrolling in TextInput with mid string pre-edit text.
Andrew den Exter [Tue, 19 Apr 2011 02:01:17 +0000 (12:01 +1000)]
Fix excessive scrolling in TextInput with mid string pre-edit text.

Don't emit text or cursor position changed signals until all the state
changes from the input method event are made.  Otherwise properties
like horizontal scroll are updated based on invalid intermediate data.

Change-Id: If543dbe58dc571aeda495152d99be95645eea140
Task-number: QTBUG-18789
Reviewed-by: Martin Jones
6 years agocompile fix
Alan Alpert [Mon, 18 Apr 2011 23:30:27 +0000 (09:30 +1000)]
compile fix

Change-Id: Iafecff30dc54e38d85cc9bb248ede69ee10ba56d

6 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qt-qml-team into qtquick2
Alan Alpert [Mon, 18 Apr 2011 23:04:50 +0000 (09:04 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qt-qml-team into qtquick2

6 years agoFix capitalization
Alan Alpert [Mon, 18 Apr 2011 23:04:13 +0000 (09:04 +1000)]
Fix capitalization

Properties are now colorTable, sizeTable and opacityTable.

Change-Id: I389be61e20878ce0ec61e83c85c225a03db2a116

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Mon, 18 Apr 2011 22:17:02 +0000 (08:17 +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:
  QtDBus: Add unit tests for QDBusAbstractAdaptor
  QtDBus: Add unit tests for QDBusInterface
  QtDBus: Add unit tests for QDBusAbstractInterface
  QtDBus: Register QDBusServer connection name in QDBusConnectionManager
  QtDBus: Skip bus name check for peer-to-peer connection
  QtDBus: Fix minor coding style issues
  QtDBus: Add default constructor to QDBusServer
  QtDBus: Add unit tests for peer-to-peer connection
  QtDBus: Add method QDBusConnection::disconnectFromPeer()
  QtDBus: Add method QDBusConnection::connectToPeer()
  QtDBus: Fix QDBusConnection::disconnectFromBus() for peer-to-peer connections
  QtDBus: Fix bus in peer-to-peer connections should not be used
  QtDBus: Fix empty service name in peer-to-peer connections
  QtDBus: Fix registering objects using path '/' in peer-to-peer connections
  QtDBus: Fix QDBusServer to handle correctly new dbus connections
  QtDBus: Cleaning comments, spacing, etc.

6 years agoMerge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
Olivier Goffart [Mon, 18 Apr 2011 16:31:19 +0000 (18:31 +0200)]
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
qmake/generators/makefile.cpp
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
src/corelib/global/qnamespace.h
src/gui/text/qtextcontrol.cpp

6 years agoQtDBus: Add unit tests for QDBusAbstractAdaptor
Daniele E. Domenichelli [Mon, 18 Apr 2011 16:21:18 +0000 (11:21 -0500)]
QtDBus: Add unit tests for QDBusAbstractAdaptor

Merge-request: 2343
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
6 years agoQtDBus: Add unit tests for QDBusInterface
Daniele E. Domenichelli [Mon, 18 Apr 2011 16:21:17 +0000 (11:21 -0500)]
QtDBus: Add unit tests for QDBusInterface

Merge-request: 2343
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
6 years agoQtDBus: Add unit tests for QDBusAbstractInterface
Daniele E. Domenichelli [Mon, 18 Apr 2011 16:21:16 +0000 (11:21 -0500)]
QtDBus: Add unit tests for QDBusAbstractInterface

Also fix xml in tests/auto/qdbusabstractinterface/com.trolltech.QtDBus.Pinger.xml

Merge-request: 2343
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>