qt:staging.git
7 years agoLabout in progress: Some work on IAccessible2 support. qml-team/iaccessible2
Jan-Arve Sæther [Fri, 6 May 2011 10:53:52 +0000 (12:53 +0200)]
Labout in progress: Some work on IAccessible2 support.

7 years agoQDeclarativeDebugServer: Send hello answer before any service messages
Thorbjørn Lindeijer [Wed, 6 Apr 2011 14:31:09 +0000 (16:31 +0200)]
QDeclarativeDebugServer: Send hello answer before any service messages

This is necessary since some services may like to send a message back
immediately when its state changes to enabled.

Reviewed-by: Kai Koehne
7 years agoRemoved some superfluous semicolons
Thorbjørn Lindeijer [Wed, 6 Apr 2011 12:45:11 +0000 (14:45 +0200)]
Removed some superfluous semicolons

Reviewed-by: Kai Koehne
7 years agoQmlViewer: Translate UI
Kai Koehne [Mon, 2 May 2011 12:03:35 +0000 (14:03 +0200)]
QmlViewer: Translate UI

Install translators for the Qt & QmlViewer translations. also
add QT_NO_CAST_FROM_ASCII, QT_NO_CAST_TO_ASCII to check for untranslated
strings.

Reviewed-by: Oswald Buddenhagen
Task-number: QTBUG-14848

7 years agoFix insert and scroll to bottom case
mae [Tue, 26 Apr 2011 13:41:21 +0000 (15:41 +0200)]
Fix insert and scroll to bottom case

When using QtextCursor::insert() with a large text followed by setting
the vertical scrollbar to its maximum value (scroll to bottom),
QPlainTextEdit would not behave properly if a document size
change was triggered by the insertion due to line wrapping.

This was visible in Qt Creator.

Auto test included.

Reviewed-by: con
7 years agoMerge branch 'master' of ../qt-qml-staging
Michael Brasser [Thu, 14 Apr 2011 04:47:16 +0000 (14:47 +1000)]
Merge branch 'master' of ../qt-qml-staging

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Wed, 13 Apr 2011 12:28:42 +0000 (22:28 +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:
  Remove a race condition in SIGCHLD handler.
  Fix warnings about && inside ||

7 years agoRemove a race condition in SIGCHLD handler.
Thiago Macieira [Thu, 3 Feb 2011 19:40:47 +0000 (20:40 +0100)]
Remove a race condition in SIGCHLD handler.

If the SIGCHLD is delivered *just* as we're installing our handler,
there's a race condition in the setting of the old handler. So instead
rely on the OS to set it properly before it calls our handler.

Reviewed-by: Olivier Goffart
7 years agoFix warnings about && inside ||
Thiago Macieira [Fri, 8 Apr 2011 23:58:18 +0000 (01:58 +0200)]
Fix warnings about && inside ||

Reviewed-By: Trust Me
7 years agoMerge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Wed, 13 Apr 2011 06:23:42 +0000 (16:23 +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:
  Allow enum values to be used as signal parameters
  ListModel::clear() should not clear roles
  Make sure removed QTextBlock is invalid
  Cocoa: Fixup wrong code in patch baaa5ae

7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team
Qt Continuous Integration System [Wed, 13 Apr 2011 04:25:28 +0000 (14:25 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
  QDeclarativeDebug: Fix test case
  QDeclarativeDebug: Handle case where client with ongoing queries is deleted

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

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Tue, 12 Apr 2011 08:06:27 +0000 (18:06 +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:
  Update XCreateWindow in qgl_X11egl.cpp
  Lancelot: support for custom keys added to protocol. API cleanup.

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging
aavit [Tue, 12 Apr 2011 07:46:27 +0000 (09:46 +0200)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging

7 years agoUpdate XCreateWindow in qgl_X11egl.cpp
JuanZhao [Tue, 12 Apr 2011 07:37:53 +0000 (09:37 +0200)]
Update XCreateWindow in qgl_X11egl.cpp

XCreateWindow should provide mask and colormap, or this may load XCreateWindow error in the server side.

Merge-request: 1183
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Tue, 12 Apr 2011 02:35:28 +0000 (12:35 +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:
  Allow enum values to be used as signal parameters
  ListModel::clear() should not clear roles

7 years agoAllow enum values to be used as signal parameters
Bea Lam [Tue, 5 Apr 2011 06:55:18 +0000 (16:55 +1000)]
Allow enum values to be used as signal parameters

The fix does not work for enums declared outside of the class that
emits the signal, since in this case it is not possible to access
the metaobject of the class that declared the enum. However the
fix makes a special case for the Qt namespace to allow enums in this
namespace to be used.

Task-number: QTBUG-15983
Change-Id: I6f72255b07010311a20fe068bd97c7db7b294d9b
Reviewed-by: Aaron Kennedy
7 years agoListModel::clear() should not clear roles
Bea Lam [Fri, 8 Apr 2011 04:20:17 +0000 (14:20 +1000)]
ListModel::clear() should not clear roles

Clearing a model and then appending a new object with a subset of the
previous roles was causing a crash since ListModel cleared the roles
and VisualDataModel did not, so VisualDataModel was requesting invalid
roles. This could have been fixed by clearing the meta object and
its property cache in in VisualDataModel but this is less efficient,
and also the general use case is for model data to always have the same
roles.

Task-number: QTBUG-18587
Change-Id: Ib11d2292888ab7a41e772b1e11700cd665e94ae7
Reviewed-by: Michael Brasser
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
Qt Continuous Integration System [Mon, 11 Apr 2011 17:57:06 +0000 (03:57 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
  Cocoa: Fixup wrong code in patch baaa5ae

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master...
Qt Continuous Integration System [Mon, 11 Apr 2011 11:45:19 +0000 (21:45 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging:
  Updated QtOpenGL DEF file
  Updated QtOpenVG DEF file
  Updated QtGui DEF file for ARMV5
  Updated DEF files

7 years agoMerge remote-tracking branch 'qt-releng-team/master'
Eckhart Koppen [Mon, 11 Apr 2011 11:18:28 +0000 (14:18 +0300)]
Merge remote-tracking branch 'qt-releng-team/master'

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Mon, 11 Apr 2011 10:58:18 +0000 (20:58 +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:
  Make sure removed QTextBlock is invalid

7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Mon, 11 Apr 2011 10:43:57 +0000 (20:43 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (119 commits)
  Lancelot: support for custom keys added to protocol. API cleanup.
  Designer: Allow promoted QWidget's to be buddies.
  Designer: Specify 'notr' attribute for buttongroup name.
  [QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap)
  HTTP cacheing: do not store the date header with the resource
  Let's not write to the source buffer when blending argb32 on rgb16.
  Add support for -unset <prop> option to qmake.
  make -markuntranslated work without -idbased
  fix conditional on shell type
  Cocoa: p1 bug fix: fix auto test regressions
  Ensure shared network session deleted from correct thread
  Revert "Remove SIGBUS emission from QNetworkSession destruction."
  Image w/ PreserveAspectFit has its width changed once more than needed.
  fix QLocalSocket::isValid() on Windows
  Cocoa: p1 bug fix: revert use of subWindowStacking
  Not possible to enter negative values to widgets with numeric fields
  QmlViewer: Enable remote qml debugging
  QDeclarativeDebug: Warn user for Qt configured with -no-declarative-debug
  Fix typos in QSharedPointer documentation.
  Improve Flickable dynamics and allow platform specific tweaking.
  ...

7 years agoLancelot: support for custom keys added to protocol. API cleanup.
aavit [Mon, 11 Apr 2011 10:26:27 +0000 (12:26 +0200)]
Lancelot: support for custom keys added to protocol. API cleanup.

7 years agoMake sure removed QTextBlock is invalid
Jiang Jiang [Fri, 8 Apr 2011 15:34:51 +0000 (17:34 +0200)]
Make sure removed QTextBlock is invalid

If the block is removed from document block map, we will mark the
right node to the current head->freelist index, but it shouldn't
be accessed directly, otherwise it can cause crash because of
uninitialized node.

Hence we need to check if a node index is equal to current freelist
index. If so, it cannot be a valid block.

Task-number: QTBUG-18500
Reviewed-by: Eskil
7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Mon, 11 Apr 2011 07:04:38 +0000 (17:04 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
  Remove workaround and fix properly
  Optimize loc.prf for localization
  Remove obsolete files from qt.iby

7 years agoCocoa: Fixup wrong code in patch baaa5ae
Richard Moe Gustavsen [Mon, 11 Apr 2011 06:58:09 +0000 (08:58 +0200)]
Cocoa: Fixup wrong code in patch baaa5ae

Sort of imbarassing, but baaa5ae went in before I checked
that the old-behaviour-flag also worked. Which is didn't.
This patch will make things good.

Task-number: QTBUG-11481
Reviewed-by: jbache
7 years agoMerge remote branch 'qt-master/master'
Guoqing Zhang [Mon, 11 Apr 2011 06:18:57 +0000 (09:18 +0300)]
Merge remote branch 'qt-master/master'

Conflicts:
src/s60installs/qt.iby

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Sun, 10 Apr 2011 01:30:44 +0000 (11:30 +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:
  Lancelot: bail out if rendering consistently fails
  Minor optimization to lance/elot
  Make it possible to test the new font hinting in lance[elot]
  Fixes: The "test: too many arguments" error after every make

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integ...
Qt Continuous Integration System [Sat, 9 Apr 2011 21:27:12 +0000 (07:27 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
  Designer: Allow promoted QWidget's to be buddies.
  Designer: Specify 'notr' attribute for buttongroup name.

7 years agoMerge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Sat, 9 Apr 2011 17:09:24 +0000 (03:09 +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:
  [QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap)
  HTTP cacheing: do not store the date header with the resource
  Let's not write to the source buffer when blending argb32 on rgb16.
  make -markuntranslated work without -idbased
  fix conditional on shell type

7 years agoMerge branch 4.7 into qt-master-from-4.7
Qt Continuous Integration System [Sat, 9 Apr 2011 16:05:13 +0000 (02:05 +1000)]
Merge branch 4.7 into qt-master-from-4.7

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
Qt Continuous Integration System [Sat, 9 Apr 2011 03:31:00 +0000 (13:31 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
  Fix typos in QSharedPointer documentation.
  Remove test for compiler correctness
  Refactor qpointer dereference tests
  Prefer QCOMPARE to QVERIFY for comparisons.
  Improve coverage of qpointer autotest
  Add comments, eliminate duplication in qpointer autotest.
  Remove redundant includes and functions from qpointer autotest.
  Fix tst_XmlPatterns::xquerySupport() autotest
  Update copyright year to 2011.
  BM2: Little fix to make the `make check-trusted' to work on Linux and Windows.

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Sat, 9 Apr 2011 01:19:49 +0000 (11:19 +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:
  [QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap)
  HTTP cacheing: do not store the date header with the resource

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Fri, 8 Apr 2011 23:45:08 +0000 (09:45 +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:
  Add support for -unset <prop> option to qmake.

7 years agoMerge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Fri, 8 Apr 2011 19:13:07 +0000 (05:13 +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:
  Cocoa: p1 bug fix: fix auto test regressions
  Ensure shared network session deleted from correct thread
  Revert "Remove SIGBUS emission from QNetworkSession destruction."
  Image w/ PreserveAspectFit has its width changed once more than needed.
  Cocoa: p1 bug fix: revert use of subWindowStacking

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Fri, 8 Apr 2011 17:21:34 +0000 (03:21 +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:
  Let's not write to the source buffer when blending argb32 on rgb16.

7 years agoMerge branch 4.7 into qt-master-from-4.7
Qt Continuous Integration System [Fri, 8 Apr 2011 16:06:51 +0000 (02:06 +1000)]
Merge branch 4.7 into qt-master-from-4.7

7 years agoDesigner: Allow promoted QWidget's to be buddies.
Friedemann Kleint [Fri, 8 Apr 2011 15:14:22 +0000 (17:14 +0200)]
Designer: Allow promoted QWidget's to be buddies.

Extend check for focusPolicy by promoted check.

Task-number: QTBUG-18631

7 years agoDesigner: Specify 'notr' attribute for buttongroup name.
Friedemann Kleint [Fri, 8 Apr 2011 15:03:43 +0000 (17:03 +0200)]
Designer: Specify 'notr' attribute for buttongroup name.

Such that the name does not show up in lupdate.

7 years ago[QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap)
Arnold Konrad [Fri, 8 Apr 2011 13:00:11 +0000 (15:00 +0200)]
[QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap)

Windows 7 sends WM_SIZE messages without preceding WM_SYSCOMMAND
when a window is maximized or restored via Aero Snap. These messages
are now handled correctly.

Merge-request: 1105
Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
7 years agoHTTP cacheing: do not store the date header with the resource
Peter Hartmann [Thu, 31 Mar 2011 12:50:20 +0000 (14:50 +0200)]
HTTP cacheing: do not store the date header with the resource

... to avoid re-writing the resource to disk when retrieving the
resource from cache. We are currently using the "Expires", "max-age"
and "s-maxage" headers to determine when a cached resource will expire.

Autotests still pass and the demo browser reports the same amount of
pages loaded from the cache.

Reviewed-by: Markus Goetz
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Fri, 8 Apr 2011 12:32:31 +0000 (22:32 +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:
  make -markuntranslated work without -idbased
  fix conditional on shell type

7 years agoMerge remote-tracking branch 'qt-symbian-review/master'
Sami Lempinen [Fri, 8 Apr 2011 11:47:49 +0000 (14:47 +0300)]
Merge remote-tracking branch 'qt-symbian-review/master'

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging
Sami Lempinen [Fri, 8 Apr 2011 11:44:27 +0000 (14:44 +0300)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging

7 years agoLet's not write to the source buffer when blending argb32 on rgb16.
Samuel Rødal [Fri, 8 Apr 2011 09:58:59 +0000 (11:58 +0200)]
Let's not write to the source buffer when blending argb32 on rgb16.

Even though we're writing the same values back, we might get a segfault
when the source is in read-only memory.

Reviewed-by: Kim
7 years agoAdd support for -unset <prop> option to qmake.
Darryl L. Miles [Fri, 8 Apr 2011 10:10:42 +0000 (12:10 +0200)]
Add support for -unset <prop> option to qmake.

Merge-request: 1175
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
7 years agomake -markuntranslated work without -idbased
Oswald Buddenhagen [Fri, 8 Apr 2011 08:59:09 +0000 (10:59 +0200)]
make -markuntranslated work without -idbased

Task-number: QTBUG-18625

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integ...
Qt Continuous Integration System [Fri, 8 Apr 2011 08:46:18 +0000 (18:46 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
  fix QLocalSocket::isValid() on Windows

7 years agofix conditional on shell type
Oswald Buddenhagen [Tue, 5 Apr 2011 14:56:38 +0000 (16:56 +0200)]
fix conditional on shell type

7 years agoUpdated QtOpenGL DEF file
Eckhart Koppen [Fri, 8 Apr 2011 08:23:00 +0000 (11:23 +0300)]
Updated QtOpenGL DEF file

Absented missig functions

Reviewed-by: TrustMe
7 years agoMerge remote-tracking branch 'qt-master/master'
Eckhart Koppen [Fri, 8 Apr 2011 06:59:19 +0000 (09:59 +0300)]
Merge remote-tracking branch 'qt-master/master'

Conflicts:
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtOpenGLu.def
src/s60installs/bwins/QtOpenVGu.def
src/s60installs/eabi/QtOpenGLu.def
src/s60installs/eabi/QtOpenVGu.def

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
Qt Continuous Integration System [Fri, 8 Apr 2011 00:36:29 +0000 (10:36 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
  Cocoa: p1 bug fix: fix auto test regressions
  Cocoa: p1 bug fix: revert use of subWindowStacking

7 years agoMerge remote branch 'qa-review/master' into qa-staging-master
Rohan McGovern [Thu, 7 Apr 2011 23:59:05 +0000 (09:59 +1000)]
Merge remote branch 'qa-review/master' into qa-staging-master

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Thu, 7 Apr 2011 23:38:13 +0000 (09:38 +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:
  Avoid compilation warnings on Symbian
  Get rid of double conversions and arithmetic when qreal is float.

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 7 Apr 2011 20:32:18 +0000 (06:32 +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:
  Image w/ PreserveAspectFit has its width changed once more than needed.

7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Thu, 7 Apr 2011 14:49:35 +0000 (00:49 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
  Lancelot: bail out if rendering consistently fails
  Minor optimization to lance/elot
  Make it possible to test the new font hinting in lance[elot]

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Thu, 7 Apr 2011 14:45:26 +0000 (00:45 +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:
  Ensure shared network session deleted from correct thread
  Revert "Remove SIGBUS emission from QNetworkSession destruction."

7 years agoMerge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Thu, 7 Apr 2011 13:54:48 +0000 (23:54 +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: (94 commits)
  Not possible to enter negative values to widgets with numeric fields
  QmlViewer: Enable remote qml debugging
  QDeclarativeDebug: Warn user for Qt configured with -no-declarative-debug
  Improve Flickable dynamics and allow platform specific tweaking.
  Fixed the declarative headers and includes within qdoc.
  Removed invalid public slots section.
  Minor feature fix led to refactoring for i18n's sake.
  Fixed string-int concatenation issue.
  Fixed license headers for examples in 4.7
  qdoc: Allowed multiple values for certain metadata tags.
  Removing extra comma in `enum' declaration.
  Take phonon backend back in qt.iby
  Mac: p2 combobox regression fix
  win32-g++: Correct the order of linked Windows libraries
  Remove SIGBUS emission from QNetworkSession destruction.
  Remove obsolete files from qt.iby
  Fix QGradient stop with NaN position on Symbian.
  win32-g++: Correct the order of linked Windows libraries
  Fixing a traling space on if statement that fails in Solaris.
  Do not add project path to SYMBIAN_MATCHED_TRANSLATIONS if not needed
  ...

7 years agoMerge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
Olivier Goffart [Thu, 7 Apr 2011 13:13:08 +0000 (15:13 +0200)]
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
src/gui/text/qfontengine_mac.mm
tests/auto/qdiriterator/tst_qdiriterator.cpp

7 years agoLancelot: bail out if rendering consistently fails
aavit [Thu, 7 Apr 2011 13:02:02 +0000 (15:02 +0200)]
Lancelot: bail out if rendering consistently fails

7 years agoMinor optimization to lance/elot
aavit [Thu, 7 Apr 2011 12:49:54 +0000 (14:49 +0200)]
Minor optimization to lance/elot

7 years agoMake it possible to test the new font hinting in lance[elot]
aavit [Thu, 7 Apr 2011 12:32:19 +0000 (14:32 +0200)]
Make it possible to test the new font hinting in lance[elot]

A rudimentary test script is also included, showing the use of the new
parameter to the qps setFont command.

7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Thu, 7 Apr 2011 12:14:05 +0000 (22:14 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
  Remove workaround and fix properly

7 years agoRemove workaround and fix properly
Sami Merila [Thu, 7 Apr 2011 12:01:23 +0000 (15:01 +0300)]
Remove workaround and fix properly

The workaround for 3.1 can now completely removed,
since support for 3.x was dropped.

Task-number: QTBUG-4565
Reviewed-by: Miikka Heikkinen
7 years agoCocoa: p1 bug fix: fix auto test regressions
Richard Moe Gustavsen [Thu, 7 Apr 2011 09:38:46 +0000 (11:38 +0200)]
Cocoa: p1 bug fix: fix auto test regressions

Ref: 32228c4f2b3419a35d1623377050ef72edf73c92
It seems that the change above broke some auto tests, which
revealed a true problem. When it comes to modal dialog, children
still needs to be stacked on top of modal parents, as they the
user cannot use the mouse to raise it. So rather than removing
subWindowStacking fully, we narrow it even further down to
only be used for children of modal dialogs. All in all, this
is close to removing it, but still us it for certain corner cases.

Task-number: QTBUG-11481
Reviewed-by: msorvig
7 years agoEnsure shared network session deleted from correct thread
Shane Kearns [Mon, 28 Mar 2011 16:53:45 +0000 (17:53 +0100)]
Ensure shared network session deleted from correct thread

Due to threaded http, the shared QNetworkSession can have its last
reference removed from a http delegate thread. To avoid this deadlocking
use a deleteLater custom deleter so that the QNS is deleted from the
thread it has affinity for.

Reviewed-by: Markus Goetz
Task-Number: QTBUG-17464

7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Thu, 7 Apr 2011 09:14:11 +0000 (19:14 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (53 commits)
  Fixes: The "test: too many arguments" error after every make
  Fixed license headers for examples in master
  Fixed deployment problems with MSVC 2005 and 2008 SP1
  QLocalSocket/Win: handle ERROR_ACCESS_DENIED
  Add branch prediction macros
  Add methods for traversing and combining QProcessEnvironment.
  Designer [Qt Creator integration]: Fix integrated property editor.
  Handle the HTTP 418 reply properly in QNAM
  absorb translations.pri into translations.pro
  let generated flag control SQL generation
  Add version attributes as per ODF specification
  Fixed QFtp autotests not to crash in network time out situations
  Make createpackage and patch_capabilties scripts use tmp dir
  Fix for QTBUG-16985.
  Revert "QComboBox fix for QTBUG-16985"
  Moving Symbian CPU core detection to qthread_symbian.cpp
  QComboBox fix for QTBUG-16985
  Making Symbian helper threads exit cleanly at app exit
  Add ".make.cache" to the files to be cleaned for symbian-abld.
  Fix mismatched $$translations handling after merge
  ...

7 years agoMerge remote branch 'qt-mainline/master'
aavit [Thu, 7 Apr 2011 09:00:15 +0000 (11:00 +0200)]
Merge remote branch 'qt-mainline/master'

7 years agoFixes: The "test: too many arguments" error after every make
aavit [Thu, 7 Apr 2011 08:26:12 +0000 (10:26 +0200)]
Fixes: The "test: too many arguments" error after every make

If the gdb version string was not matched, it would be passed in full
to test. This new regexp matches the different kinds of gdb
version string observed in the wild, as listed in
qtcreator/tests/auto/debugger/tst_version.cpp

Reviewed-by: aep <arvid.picciani@nokia.com>
7 years agoRevert "Remove SIGBUS emission from QNetworkSession destruction."
Adrian Constantin [Thu, 7 Apr 2011 07:39:49 +0000 (10:39 +0300)]
Revert "Remove SIGBUS emission from QNetworkSession destruction."

This reverts commit b40d04a19f4c186bf47aad128b0618c629629e07.

Reviewed-by: Shane Kearns
    It is usual for QXyzPrivate implementation to assume
    that the parent QXyz is a valid object.

Reviewed-by: Cristiano di Flora
7 years agoImage w/ PreserveAspectFit has its width changed once more than needed.
Martin Jones [Wed, 6 Apr 2011 05:46:35 +0000 (15:46 +1000)]
Image w/ PreserveAspectFit has its width changed once more than needed.

Avoid an extra setImplicitWidth/setImplicitHeight on image load.

Change-Id: I8bec1c97244068000c7a7f5fb3e937f80f3b36f5
Task-number: QTBUG-18573
Reviewed-by: Michael Brasser
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 7 Apr 2011 02:41:30 +0000 (12:41 +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:
  QmlViewer: Enable remote qml debugging
  QDeclarativeDebug: Warn user for Qt configured with -no-declarative-debug

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

* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
  Fixed the declarative headers and includes within qdoc.
  Removed invalid public slots section.
  Minor feature fix led to refactoring for i18n's sake.
  Fixed string-int concatenation issue.
  qdoc: Allowed multiple values for certain metadata tags.
  qdoc: modified \include to take a 2nd arg, snippet id.
  Doc: Minor fix to title.
  Doc: Fixed markup.
  Doc: Added a missing command.
  Doc: Removed duplicate documentation.
  Removed some links and prettified others.
  Doc: Squashed commit of Roland Wolf's threading tutorial.

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 6 Apr 2011 18:22:51 +0000 (04:22 +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:
  Not possible to enter negative values to widgets with numeric fields

7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team
Qt Continuous Integration System [Wed, 6 Apr 2011 17:22:12 +0000 (03:22 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
  Fix typos in QSharedPointer documentation.

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Wed, 6 Apr 2011 16:22:26 +0000 (02:22 +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:
  Fixed license headers for examples in master

7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Wed, 6 Apr 2011 16:15:29 +0000 (02:15 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
  Avoid compilation warnings on Symbian
  Get rid of double conversions and arithmetic when qreal is float.

7 years agofix QLocalSocket::isValid() on Windows
Joerg Bornemann [Fri, 1 Apr 2011 16:35:28 +0000 (18:35 +0200)]
fix QLocalSocket::isValid() on Windows

This function always returned false, even if the socket was connected.

Task-number: QTBUG-18204
Reviewed-by: Martin Petersson
7 years agoUpdated QtOpenVG DEF file
Eckhart Koppen [Wed, 6 Apr 2011 12:42:02 +0000 (15:42 +0300)]
Updated QtOpenVG DEF file

Added new functions and absented missing functions

Reviewed-by: TrustMe
7 years agoMerge remote-tracking branch 'qt-master/master'
Eckhart Koppen [Wed, 6 Apr 2011 12:36:15 +0000 (15:36 +0300)]
Merge remote-tracking branch 'qt-master/master'

7 years agoCocoa: p1 bug fix: revert use of subWindowStacking
Richard Moe Gustavsen [Wed, 6 Apr 2011 09:07:08 +0000 (11:07 +0200)]
Cocoa: p1 bug fix: revert use of subWindowStacking

This reverts commit 3c2373d7ea9bc91bb537c0725984d19ad0fbab01.
After finding yet another bug related to cocoa child windows
(QTBUG-17738), we have no other option than to admit it was a wrong
move to use the API in the first place. Had we only known how many
side-effects and hidden bugs it would introduce. The original problem
we tried to solve were the cases where a stays-on-top parent window
executed a modal child dialog. This child should always stay on top of
its parent, but Cocoa would insist on pushing the window down to the modal
window level upon activating/deactivating the application. Some window
systems will always stack a window child on top of the parent, while
others (X11) seems to be more selective on this issue. On Mac, we already
stack windows a  bit differently, thinking first and foremost on tool
windows.

Since this change is going into a patch release (which is debatable,
since this changes behaviour, but p1 is a p1), we choose to add in a
backdoor for those users who by chance depend on this behaviour. Setting
the env var QT_MAC_USE_CHILDWINDOWS=1 will give you the old code
path, but we plan to remove this for Qt-4.8.

Also, this patch does fix the original bug described above by overriding
the setLevel method in NSWindow, and refuse Cocoa to level down
stays-on-top modal windows.

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Wed, 6 Apr 2011 11:02:25 +0000 (21:02 +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:
  Fixed compilation of qpixmap_raster.cpp
  Draw graphics item bounding rects drawn when QT_DRAW_SCENE_ITEM_RECTS=1
  Put all the declarations of qt_defaultDpi{,X,Y}() in one place
  Really avoid compiler warnings on Windows
  Made extension resolving work with Core profile.
  Avoid some compiler warnings on Windows
  Fix positioning in GL2 paint engine with subpixel antialiasing
  Update defs files
  Doc: Updating 3rdparty license doc
  Update .def files
  Another compilation fix for WinCE
  Updating libjpeg: Add Qt building modifications
  Updating libjpeg: Add version 8c.
  Updating libjpeg: Removing libjpeg version 8

7 years agoNot possible to enter negative values to widgets with numeric fields
Sami Merila [Wed, 6 Apr 2011 10:52:34 +0000 (13:52 +0300)]
Not possible to enter negative values to widgets with numeric fields

Currently it is not possible to enter negative number to QSpinBox (or
to any other QWidget which is handling numeric input only) in touch
devices. This is due to that AVKON virtual keyboards have
negative sign (-) in special character table(s) and it is not
accessible by default from QWidgets, unless you define widget's input
hints as ImhFormattedNumbersOnly AND ImhDialableCharactersOnly
(or non-numeric).

With this fix, default special character table is added for widgets
with numeric input mode AND either ImhFormattedNumbersOnly or
ImhDialableCharactersOnly.

By default user is still unable to enter nagative values to QSpinBox,
but developer can set inputMethodHint to work around the issue:

    widget->setInputMethodHints(Qt::ImhFormattedNumbersOnly);

Task-number: QTBUG-17461
Reviewed-by: Miikka Heikkinen
7 years agoQmlViewer: Enable remote qml debugging
Kai Koehne [Wed, 6 Apr 2011 10:41:05 +0000 (12:41 +0200)]
QmlViewer: Enable remote qml debugging

Allow users to use qmlviewer for profiling.

Change-Id: I4bddabceade17260159ff5b46b35072afb204ff6
Task-number: QTBUG-18595
Reviewed-by: Christiaan Janssen
7 years agoAvoid compilation warnings on Symbian
aavit [Wed, 6 Apr 2011 10:19:18 +0000 (12:19 +0200)]
Avoid compilation warnings on Symbian

7 years agoQDeclarativeDebug: Warn user for Qt configured with -no-declarative-debug
Kai Koehne [Tue, 5 Apr 2011 14:39:52 +0000 (16:39 +0200)]
QDeclarativeDebug: Warn user for Qt configured with -no-declarative-debug

Print a warning if the user passes -qmljsdebugger on command line, but
Qt is configured with -no-declarative-debug

Change-Id: I72c9ffad9631ffe8582c13e3a4e798b102d0efad
Reviewed-by: Christiaan Janssen
7 years agoGet rid of double conversions and arithmetic when qreal is float.
Samuel Rødal [Wed, 6 Apr 2011 07:25:10 +0000 (09:25 +0200)]
Get rid of double conversions and arithmetic when qreal is float.

Task-number: QT-4624
Reviewed-by: Kim
7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Wed, 6 Apr 2011 07:09:19 +0000 (17:09 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
  Optimize loc.prf for localization
  Fixed deployment problems with MSVC 2005 and 2008 SP1
  QLocalSocket/Win: handle ERROR_ACCESS_DENIED

7 years agoFix typos in QSharedPointer documentation.
Jason McDonald [Wed, 6 Apr 2011 07:06:50 +0000 (17:06 +1000)]
Fix typos in QSharedPointer documentation.

Reviewed-by: Trust Me
7 years agoMerge remote branch 'qt-master/master'
Guoqing Zhang [Wed, 6 Apr 2011 06:55:21 +0000 (09:55 +0300)]
Merge remote branch 'qt-master/master'

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Wed, 6 Apr 2011 05:30:18 +0000 (15:30 +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:
  Improve Flickable dynamics and allow platform specific tweaking.

7 years agoImprove Flickable dynamics and allow platform specific tweaking.
Martin Jones [Wed, 6 Apr 2011 04:51:52 +0000 (14:51 +1000)]
Improve Flickable dynamics and allow platform specific tweaking.

Flickable's previous overshoot behavior was to continue past the
boundary without any additional friction (deceleration). It now
decelerates faster when overshooting.

On touch screens in particular, the last points when a touch point
is released are unreliable, resulting in sporadic flick velocities.
It also now allows the number of samples used for velocity calclations
to be tuned.

It is now easy to tune the Flickable behavior for different platforms.

Change-Id: I24142a50be1fde2f8877e359e30b8efcdd1f7d5c
Task-number: QTBUG-10894, QTBUG-16388, QTBUG-17830
Reviewed-by: Michael Brasser
7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team
Qt Continuous Integration System [Wed, 6 Apr 2011 03:09:16 +0000 (13:09 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
  Remove test for compiler correctness
  Refactor qpointer dereference tests
  Prefer QCOMPARE to QVERIFY for comparisons.
  Improve coverage of qpointer autotest
  Add comments, eliminate duplication in qpointer autotest.
  Remove redundant includes and functions from qpointer autotest.

7 years agoRemove test for compiler correctness
Jason McDonald [Wed, 6 Apr 2011 02:57:55 +0000 (12:57 +1000)]
Remove test for compiler correctness

Unit tests are supposed to verify Qt, verifying the compiler is a
different task entirely.

Reviewed-by: Rohan McGovern
7 years agoRefactor qpointer dereference tests
Jason McDonald [Wed, 6 Apr 2011 02:12:45 +0000 (12:12 +1000)]
Refactor qpointer dereference tests

The data method is just another way of dereferencing a QPointer, so test
it in the same place as the other dereference operators.

Reviewed-by: Rohan McGovern
7 years agoPrefer QCOMPARE to QVERIFY for comparisons.
Jason McDonald [Wed, 6 Apr 2011 01:37:01 +0000 (11:37 +1000)]
Prefer QCOMPARE to QVERIFY for comparisons.

Reviewed-by: Rohan McGovern
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Tue, 5 Apr 2011 22:13:11 +0000 (08:13 +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:
  Fixed license headers for examples in 4.7
  Removing extra comma in `enum' declaration.
  win32-g++: Correct the order of linked Windows libraries
  Remove SIGBUS emission from QNetworkSession destruction.

7 years agoMerge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Tue, 5 Apr 2011 18:48:33 +0000 (04:48 +1000)]
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team

* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team:
  Fixed the declarative headers and includes within qdoc.
  Removed invalid public slots section.
  Minor feature fix led to refactoring for i18n's sake.
  Fixed string-int concatenation issue.
  Doc: Minor fix to title.
  Doc: Fixed markup.
  Doc: Added a missing command.
  Doc: Removed duplicate documentation.
  Removed some links and prettified others.
  Doc: Squashed commit of Roland Wolf's threading tutorial.

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Tue, 5 Apr 2011 18:04:43 +0000 (04:04 +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:
  Take phonon backend back in qt.iby