qt:qt-l10n-hu.git
6 years agoMerge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into master... master
Qt Continuous Integration System [Fri, 15 Apr 2011 09:21:53 +0000 (19:21 +1000)]
Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into master-integration

* 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: (94 commits)
  Lighthouse: Fix license headers
  Remove hasOpenGL. This changes breaks binary compatibillity
  Lighthouse: Fix license headers
  Compile fix for shared context change.
  Some virtual keyboard text input for uikit.
  Wayland: Conform with the api change in the frame callback
  Fix configure for Lighthouse
  Remove DefaultSharedContext from Lighthouse API.
  Make readEvents() non-blocking
  Wayland: Show what backend is being used
  Wayland: Tell what backend we use for xcomposite glx
  Wayland: compile fix after making the event handling
  Make the xcomposite the default gl integration backend
  Make sure the global listener gets registered even when using drm.
  Wayland: Rename XPixmap GL integrations to Readback
  Adapt drag distance for uikit.
  Prevented crash due to dangling pointer in QWaylandInputDevice.
  Fixed logical error in XCB backend.
  Set the _NET_WM_WINDOW_TYPE property in the XCB backend.
  Added _NET_WM_PID in XCB backend.
  ...

6 years agoLighthouse: Fix license headers
Jørgen Lind [Fri, 15 Apr 2011 05:47:54 +0000 (07:47 +0200)]
Lighthouse: Fix license headers

6 years agoRemove hasOpenGL. This changes breaks binary compatibillity
Jørgen Lind [Thu, 14 Apr 2011 13:48:36 +0000 (15:48 +0200)]
Remove hasOpenGL. This changes breaks binary compatibillity

so you will need to use $QTBUILDDIR/bin/syncqt and recompile all
applications

6 years agoMerge remote-tracking branch 'origin/master' into lighthouse-master
Jørgen Lind [Thu, 14 Apr 2011 10:23:42 +0000 (12:23 +0200)]
Merge remote-tracking branch 'origin/master' into lighthouse-master

6 years agoLighthouse: Fix license headers
Jørgen Lind [Thu, 14 Apr 2011 10:21:25 +0000 (12:21 +0200)]
Lighthouse: Fix license headers

6 years agoCompile fix for shared context change.
con [Thu, 14 Apr 2011 10:18:36 +0000 (12:18 +0200)]
Compile fix for shared context change.

6 years agoSome virtual keyboard text input for uikit.
con [Thu, 14 Apr 2011 08:34:43 +0000 (10:34 +0200)]
Some virtual keyboard text input for uikit.

It is very limited as is. But it handles Qt's RequestSoftwareInputPanel
and CloseSoftwareInputPanel events.

6 years agoWayland: Conform with the api change in the frame callback
Jørgen Lind [Wed, 13 Apr 2011 13:04:53 +0000 (15:04 +0200)]
Wayland: Conform with the api change in the frame callback

6 years agoFix configure for Lighthouse
Jørgen Lind [Wed, 13 Apr 2011 12:02:01 +0000 (14:02 +0200)]
Fix configure for Lighthouse

Dont assume that we are QWS :)

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

6 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
6 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
6 years agoRemove DefaultSharedContext from Lighthouse API.
Samuel Rødal [Wed, 13 Apr 2011 06:49:52 +0000 (08:49 +0200)]
Remove DefaultSharedContext from Lighthouse API.

QPlatformWindowFormat::setUseDefaultSharedContext was meant as a
convenience, but it adds complexity in the platform plugin
implementation, and can be implemented by the above layers using
QPlatformWindowFormat::setSharedContext.

Reviewed-by: Jørgen Lind
6 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

6 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

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

6 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

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

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

6 years agoMake readEvents() non-blocking
Paul Olav Tvete [Mon, 11 Apr 2011 12:48:47 +0000 (14:48 +0200)]
Make readEvents() non-blocking

Another event handler could empty the Wayland socket after the
socket notifier has triggered, but before the signal is delivered.
Since wl_display_iterate is blocking, we have to test whether there
is data available to avoid freezing the whole application.

Reviewed-by: Samuel
6 years agoWayland: Show what backend is being used
Jørgen Lind [Mon, 11 Apr 2011 11:53:38 +0000 (13:53 +0200)]
Wayland: Show what backend is being used

6 years agoWayland: Tell what backend we use for xcomposite glx
Jørgen Lind [Mon, 11 Apr 2011 11:38:53 +0000 (13:38 +0200)]
Wayland: Tell what backend we use for xcomposite glx

6 years agoWayland: compile fix after making the event handling
Jørgen Lind [Mon, 11 Apr 2011 10:37:36 +0000 (12:37 +0200)]
Wayland: compile fix after making the event handling

single threaded

6 years agoMake the xcomposite the default gl integration backend
Jørgen Lind [Mon, 11 Apr 2011 08:41:40 +0000 (10:41 +0200)]
Make the xcomposite the default gl integration backend

The others can be opted in with the environment variable:
QT_WAYLAND_GL_CONFIG

6 years agoMake sure the global listener gets registered even when using drm.
Samuel Rødal [Mon, 11 Apr 2011 11:44:49 +0000 (13:44 +0200)]
Make sure the global listener gets registered even when using drm.

6 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

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

6 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

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

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

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

6 years agoWayland: Rename XPixmap GL integrations to Readback
Jørgen Lind [Mon, 11 Apr 2011 07:00:14 +0000 (09:00 +0200)]
Wayland: Rename XPixmap GL integrations to Readback

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

6 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

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

6 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

6 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

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

6 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

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

6 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

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

6 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

6 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

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

6 years agoAdapt drag distance for uikit.
con [Fri, 8 Apr 2011 14:11:24 +0000 (16:11 +0200)]
Adapt drag distance for uikit.

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

6 years agoPrevented crash due to dangling pointer in QWaylandInputDevice.
Samuel Rødal [Fri, 8 Apr 2011 11:40:26 +0000 (13:40 +0200)]
Prevented crash due to dangling pointer in QWaylandInputDevice.

When a QWaylandWindow is destroyed we need to make sure it's not still
referenced by QWaylandInputDevice.

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

6 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

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

6 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

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

6 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
6 years agoFixed logical error in XCB backend.
Samuel Rødal [Fri, 8 Apr 2011 07:46:08 +0000 (09:46 +0200)]
Fixed logical error in XCB backend.

6 years agoSet the _NET_WM_WINDOW_TYPE property in the XCB backend.
Samuel Rødal [Fri, 8 Apr 2011 07:44:34 +0000 (09:44 +0200)]
Set the _NET_WM_WINDOW_TYPE property in the XCB backend.

6 years agoAdded _NET_WM_PID in XCB backend.
Samuel Rødal [Fri, 8 Apr 2011 07:33:38 +0000 (09:33 +0200)]
Added _NET_WM_PID in XCB backend.

6 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

6 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

6 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

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

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

6 years agoWayland: Add license headers to new files
Jørgen Lind [Thu, 7 Apr 2011 16:02:15 +0000 (18:02 +0200)]
Wayland: Add license headers to new files

6 years agoWayland: Add a egl xcomposite backend
Jørgen Lind [Thu, 7 Apr 2011 15:54:23 +0000 (17:54 +0200)]
Wayland: Add a egl xcomposite backend

6 years agoFixed crash in XCB backend.
Samuel Rødal [Thu, 7 Apr 2011 14:54:26 +0000 (16:54 +0200)]
Fixed crash in XCB backend.

We need to sync here for some reason.

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

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

6 years agoMade wayland plugin single-threaded, yay :)
Samuel Rødal [Thu, 7 Apr 2011 14:25:02 +0000 (16:25 +0200)]
Made wayland plugin single-threaded, yay :)

Not calling QApplication::processEvents() in qt_init any more, and not
using a write socket notifier to send data over the wayland protocol.

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

6 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

6 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

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

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

6 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

6 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
6 years agoWayland: Fix xpixmap_glx readback after multi threading
Jørgen Lind [Thu, 7 Apr 2011 11:57:03 +0000 (13:57 +0200)]
Wayland: Fix xpixmap_glx readback after multi threading

6 years agoImplemented _NET_WM_SYNC_REQUEST protocol in XCB plugin.
Samuel Rødal [Wed, 6 Apr 2011 15:17:50 +0000 (17:17 +0200)]
Implemented _NET_WM_SYNC_REQUEST protocol in XCB plugin.

Excluded KWin for now, as it sends multiple ConfigureNotify events per
_NET_WM_SYNC_REQUEST message.

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

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

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

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

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

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

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

6 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

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

6 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