qt:ritts_qt.git
8 years agoallow QFile to change file name's casing on case-insensitive file systems qfile-rename_on_case-insensitive_filesystems
Ritt Konstantin [Thu, 8 Apr 2010 09:46:05 +0000 (13:46 +0400)]
allow QFile to change file name's casing on case-insensitive file systems

QTBUG-3570

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Tue, 6 Apr 2010 23:28:14 +0000 (01:28 +0200)]
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:
  Moved item wouldn't follow mouse cursor when ItemIgnoresTransformations is set
  Fix painting artifacts on text
  Prevented unnecessary copy in QImage::setAlphaChannel().
  Change the ifdef for resolving function ptrs to match declaration

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Tue, 6 Apr 2010 18:41:43 +0000 (20:41 +0200)]
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:
  Moved item wouldn't follow mouse cursor when ItemIgnoresTransformations is set
  Fix painting artifacts on text
  Prevented unnecessary copy in QImage::setAlphaChannel().
  Change the ifdef for resolving function ptrs to match declaration

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Tue, 6 Apr 2010 16:31:02 +0000 (18:31 +0200)]
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:
  Doc: update the QDBusPendingCallWatcher example to show where to delete
  Doc: Remove QDBusServer from the public documentation.
  [Cocoa] QDialogs with WindowStayOnStopHint parent
  Fix a coding style issue of the GTK style
  Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors
  Added variable QMAKE_TARGET.arch to qmake to be used with MSVC++

8 years agoDoc: update the QDBusPendingCallWatcher example to show where to delete
Thiago Macieira [Tue, 6 Apr 2010 16:15:00 +0000 (18:15 +0200)]
Doc: update the QDBusPendingCallWatcher example to show where to delete

Task-number: QTBUG-8865

8 years agoDoc: Remove QDBusServer from the public documentation.
Thiago Macieira [Tue, 6 Apr 2010 16:09:15 +0000 (18:09 +0200)]
Doc: Remove QDBusServer from the public documentation.

Task-number: QTBUG-5066

8 years agoMoved item wouldn't follow mouse cursor when ItemIgnoresTransformations is set
Gabriel de Dietrich [Tue, 6 Apr 2010 15:04:20 +0000 (17:04 +0200)]
Moved item wouldn't follow mouse cursor when ItemIgnoresTransformations is set

Since the introduction of transform properties in QGraphicsItem,
QGraphicsItem::transform() is no longer enough to get the correct
transform of an item.

No auto-test as it involves mouse dragging.

Reviewed-by: Yoann
Task-number: QTBUG-9295

8 years agoMerge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Eskil Abrahamsen Blomfeldt [Tue, 6 Apr 2010 14:53:18 +0000 (16:53 +0200)]
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7

8 years agoFix painting artifacts on text
Eskil Abrahamsen Blomfeldt [Tue, 6 Apr 2010 14:23:34 +0000 (16:23 +0200)]
Fix painting artifacts on text

The height of the row is not only decided by the maximum height of the
set of glyphs currently being added to the glyph cache, but also the
height of the glyphs previously added to the current line in the glyph
cache. To minimize the space used, we now calculate the maximum height
for glyphs per line, and use this as the vertical advancement when
positioning the next line in the cache. The change also removes a
redundant test ((c_x + c.w > c.h) is caught earlier on and will
always be false at this point.)

Task-number: QTBUG-9176
Reviewed-by: Trond
8 years agoPrevented unnecessary copy in QImage::setAlphaChannel().
Samuel Rødal [Tue, 6 Apr 2010 14:08:20 +0000 (16:08 +0200)]
Prevented unnecessary copy in QImage::setAlphaChannel().

If the formats don't match the detch is unnecessary as operator= will
anyways destroy the detached QImageData and substitute it with the newly
created QImageData from convertToFormat.

Task-number: QTBUG-9640
Reviewed-by: Trond
8 years ago[Cocoa] QDialogs with WindowStayOnStopHint parent
Carlos Manuel Duclos Vergara [Tue, 6 Apr 2010 11:47:24 +0000 (13:47 +0200)]
[Cocoa] QDialogs with WindowStayOnStopHint parent

The problem is with beginModalSession which reorders the windows and
sends our window back. This patch queries the window level before
calling beginModalSession and sets it after beginModalSession.

Task-number: QTBUG-9392
Reviewed-by: Richard Moe Gustavsen
8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Tue, 6 Apr 2010 11:30:51 +0000 (13:30 +0200)]
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:
  Fix a coding style issue of the GTK style
  Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors
  Added variable QMAKE_TARGET.arch to qmake to be used with MSVC++

8 years agoFix a coding style issue of the GTK style
Benjamin Poulain [Tue, 6 Apr 2010 09:46:19 +0000 (11:46 +0200)]
Fix a coding style issue of the GTK style

A tab was introduced in 16614121f8eff813efadc999a7db9ce47eae769e

8 years agoSunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors
Johan Hauan [Tue, 6 Apr 2010 09:34:57 +0000 (11:34 +0200)]
Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors

GTK Style
A QHashableLatin1Literal was a bit too clever for sunstudio.
Added and alternate constructor for sunstudio(ifdef)
Should not affect other compilers.

Other: Minor compile fixes, extra semicolon after macros etc.

Merge-request: 547
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Tue, 6 Apr 2010 09:11:15 +0000 (11:11 +0200)]
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:
  Change the ifdef for resolving function ptrs to match declaration

8 years agoAdded variable QMAKE_TARGET.arch to qmake to be used with MSVC++
Zeno Albisser [Thu, 25 Mar 2010 16:39:41 +0000 (17:39 +0100)]
Added variable QMAKE_TARGET.arch to qmake to be used with MSVC++

The variable QMAKE_TARGET.arch shall be used to determine cross
compiling for x64 on a x32 system.

Reviewed-by: Marius Storm-Olsen
Task-number: QTBUG-9160

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Tue, 6 Apr 2010 07:02:47 +0000 (09:02 +0200)]
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:
  Fix anchors, etc.
  Labs (experimental) Gesture support.

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Warwick Allison [Tue, 6 Apr 2010 06:52:51 +0000 (16:52 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

8 years agoFix anchors, etc.
Warwick Allison [Tue, 6 Apr 2010 06:50:45 +0000 (16:50 +1000)]
Fix anchors, etc.
(pass parser status up to QDeclarativeItem)

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Tue, 6 Apr 2010 06:45:52 +0000 (08:45 +0200)]
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:
  Change the ifdef for resolving function ptrs to match declaration

8 years agoChange the ifdef for resolving function ptrs to match declaration
Tom Cooksey [Tue, 30 Mar 2010 14:17:10 +0000 (16:17 +0200)]
Change the ifdef for resolving function ptrs to match declaration

Reviewed-By: TrustMe
8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Tue, 6 Apr 2010 05:58:48 +0000 (07:58 +0200)]
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:
  Labs (experimental) Gesture support.

8 years agoLabs (experimental) Gesture support.
Warwick Allison [Tue, 6 Apr 2010 05:56:38 +0000 (15:56 +1000)]
Labs (experimental) Gesture support.
By popular demand.

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Tue, 6 Apr 2010 01:09:18 +0000 (03:09 +0200)]
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:
  Empty commit to trigger rebuilding in the CI system.
  Make it possible to build QtDBus and its tools on Windows CE.
  Reapply 69e873e2bfae3fc028c21d93112a75008c3bb58b now that QLibrary is fixed

8 years agoEmpty commit to trigger rebuilding in the CI system.
Thiago Macieira [Mon, 5 Apr 2010 19:50:15 +0000 (21:50 +0200)]
Empty commit to trigger rebuilding in the CI system.

8 years agoMerge remote branch 'origin/4.7' into HEAD
Thiago Macieira [Mon, 5 Apr 2010 19:47:26 +0000 (21:47 +0200)]
Merge remote branch 'origin/4.7' into HEAD

8 years agoMake it possible to build QtDBus and its tools on Windows CE.
Thiago Macieira [Mon, 5 Apr 2010 11:11:01 +0000 (13:11 +0200)]
Make it possible to build QtDBus and its tools on Windows CE.

This of course requires installing libdbus compiled for Windows CE too.

Task-number: QTBUG-9582
Patch-by: Romain Pokrzywka (from KDAB)
8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Sun, 4 Apr 2010 20:56:21 +0000 (22:56 +0200)]
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:
  Revert "Attempt at fixing Phonon build issue on Symbian."

8 years agoReapply 69e873e2bfae3fc028c21d93112a75008c3bb58b now that QLibrary is fixed
Thiago Macieira [Thu, 1 Apr 2010 20:55:42 +0000 (22:55 +0200)]
Reapply 69e873e2bfae3fc028c21d93112a75008c3bb58b now that QLibrary is fixed

It was:
"
Avoid a data relocation by not trying to store a pointer in the .data section of plugins.

Reviewed-By: Rohan McGovern
"

8 years agoRevert "Attempt at fixing Phonon build issue on Symbian."
Thiago Macieira [Sun, 4 Apr 2010 20:47:13 +0000 (22:47 +0200)]
Revert "Attempt at fixing Phonon build issue on Symbian."

This reverts commit 7992ea34f9f1ed67d4e44f43c3a8133ae5aa3ac4.

Turns out that this had already been fixed before the update to
4.4.0, but never upstreamed. Revert to the fixed version.

I'll upstream the bugfix.

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Sun, 4 Apr 2010 15:15:32 +0000 (17:15 +0200)]
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:
  Attempt at fixing Phonon build issue on Symbian.

8 years agoAttempt at fixing Phonon build issue on Symbian.
Thiago Macieira [Sun, 4 Apr 2010 10:01:11 +0000 (12:01 +0200)]
Attempt at fixing Phonon build issue on Symbian.

Why, why did someone think that template QObjects with partially
exported symbols was a good idea?

Reviewed-by: Trust Me
8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Sat, 3 Apr 2010 15:51:20 +0000 (17:51 +0200)]
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:
  [plugins] Don't conclude that a .debug file is a plugin.

8 years ago[plugins] Don't conclude that a .debug file is a plugin.
Thiago Macieira [Thu, 1 Apr 2010 20:49:45 +0000 (22:49 +0200)]
[plugins] Don't conclude that a .debug file is a plugin.

On Unix systems (that are not Mac), the Qt buildsystem splits the code
from the debug symbols using objcopy. The resulting .debug file
contains a valid ELF header, with a copy of the main library's section
headers. But the contents of those sections are missing.

When we try to dlopen(3) those libraries, libdl crashes.

So we shouldn't try to open those files.

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Fri, 2 Apr 2010 23:39:47 +0000 (01:39 +0200)]
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:
  Revert "Make s60main static lib not depend on QtCore"
  Fix regression on Symbian
  Fix broken test case
  Cleanup the deployment code
  Fix 'make sis' finding the dll on symbian
  Re-add line that was lost during webkit update.
  Work around bad naming of exported class in symbian sdk causing conflict
  Fix building on public symbian SDK.
  Fix qmake with the symbian makespec failing when project has a dash in it
  Make s60main static lib not depend on QtCore
  Remove stray non-latin1 character
  Fix out-of-source symbian build for external apps
  Update EABI def files for 4.7
  Exporting QFontDatabase::removeAllApplicationFonts()
  Adding QFontDatabase::removeAllApplicationFonts()

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Fri, 2 Apr 2010 21:35:12 +0000 (23:35 +0200)]
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:
  Revert "Make s60main static lib not depend on QtCore"
  Fix regression on Symbian
  Fix broken test case
  Cleanup the deployment code
  Fix 'make sis' finding the dll on symbian
  Re-add line that was lost during webkit update.
  Work around bad naming of exported class in symbian sdk causing conflict
  Fix building on public symbian SDK.
  Fix qmake with the symbian makespec failing when project has a dash in it
  Make s60main static lib not depend on QtCore
  Remove stray non-latin1 character
  Fix out-of-source symbian build for external apps
  Update EABI def files for 4.7
  Exporting QFontDatabase::removeAllApplicationFonts()
  Adding QFontDatabase::removeAllApplicationFonts()

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Fri, 2 Apr 2010 19:21:23 +0000 (21:21 +0200)]
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:
  Fix compilation: Linguist uses QtDeclarative .cpp and private headers
  Fix some more Q_PROPERTY followed by semi-colon
  Autotest: Add QtDeclarative to the "headersclean" test
  Fix QtDeclarative public headers to include <QtDeclarative/foo.h>
  Update #include of private headers in QtDeclarative

8 years agoFix compilation: Linguist uses QtDeclarative .cpp and private headers
Thiago Macieira [Fri, 2 Apr 2010 19:05:47 +0000 (21:05 +0200)]
Fix compilation: Linguist uses QtDeclarative .cpp and private headers

8 years agoFix some more Q_PROPERTY followed by semi-colon
Thiago Macieira [Fri, 2 Apr 2010 16:07:48 +0000 (18:07 +0200)]
Fix some more Q_PROPERTY followed by semi-colon

8 years agoAutotest: Add QtDeclarative to the "headersclean" test
Thiago Macieira [Fri, 2 Apr 2010 16:15:04 +0000 (18:15 +0200)]
Autotest: Add QtDeclarative to the "headersclean" test

All public includes are clean for QtDeclarative now.

8 years agoFix QtDeclarative public headers to include <QtDeclarative/foo.h>
Thiago Macieira [Fri, 2 Apr 2010 16:29:46 +0000 (18:29 +0200)]
Fix QtDeclarative public headers to include <QtDeclarative/foo.h>

All Qt public headers must do it like that.

8 years agoUpdate #include of private headers in QtDeclarative
Thiago Macieira [Fri, 2 Apr 2010 16:27:25 +0000 (18:27 +0200)]
Update #include of private headers in QtDeclarative

Always use private/. The WinSCW compiler doesn't search the current
directory, for whatever reason.

8 years agoRevert "Make s60main static lib not depend on QtCore"
Iain [Fri, 2 Apr 2010 08:18:44 +0000 (09:18 +0100)]
Revert "Make s60main static lib not depend on QtCore"

This reverts commit faff1c60a2a7f6ebef90249e759bdf822c8b17de.

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 1 Apr 2010 23:44:02 +0000 (01:44 +0200)]
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:
  Fix regression on Symbian
  Fix broken test case
  Cleanup the deployment code
  Fix 'make sis' finding the dll on symbian
  Re-add line that was lost during webkit update.
  Work around bad naming of exported class in symbian sdk causing conflict
  Fix building on public symbian SDK.
  Fix qmake with the symbian makespec failing when project has a dash in it
  Make s60main static lib not depend on QtCore
  Remove stray non-latin1 character
  Fix out-of-source symbian build for external apps
  Update EABI def files for 4.7
  Exporting QFontDatabase::removeAllApplicationFonts()
  Adding QFontDatabase::removeAllApplicationFonts()

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Thu, 1 Apr 2010 21:29:40 +0000 (23:29 +0200)]
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:
  Fix Phonon compilation with a namespaced Qt.
  Fix build on WinCE and Symbian: .pro file must match dir name.
  Fix compilation on solaris-g++: ctype functions are sometimes macros
  Fix compilation: no semi-colon after Q_ENUM or Q_PROPERTY

8 years agoMerge remote branch 'origin/4.7' into HEAD
Thiago Macieira [Thu, 1 Apr 2010 21:10:46 +0000 (23:10 +0200)]
Merge remote branch 'origin/4.7' into HEAD

Conflicts:
demos/declarative/minehunt/minehunt.pro

8 years agoMerge remote branch 'origin/4.7' into HEAD
Thiago Macieira [Thu, 1 Apr 2010 21:07:37 +0000 (23:07 +0200)]
Merge remote branch 'origin/4.7' into HEAD

Conflicts:
examples/declarative/proxywidgets/proxywidgets.pro
examples/declarative/widgets/mywidgets.pro
examples/declarative/widgets/widgets.pro

8 years agoFix Phonon compilation with a namespaced Qt.
Thiago Macieira [Thu, 1 Apr 2010 20:04:29 +0000 (22:04 +0200)]
Fix Phonon compilation with a namespaced Qt.

I'll upstream this patch myself.

8 years agoFix build on WinCE and Symbian: .pro file must match dir name.
Thiago Macieira [Thu, 1 Apr 2010 19:34:01 +0000 (21:34 +0200)]
Fix build on WinCE and Symbian: .pro file must match dir name.

8 years agoFix compilation on solaris-g++: ctype functions are sometimes macros
Thiago Macieira [Thu, 1 Apr 2010 19:27:00 +0000 (21:27 +0200)]
Fix compilation on solaris-g++: ctype functions are sometimes macros

At least with g++ 3.4 on Solaris, they are. So you can't write
::isalpha because that expands to something invalid.

Reviewed-by: Trust Me
8 years agoFix compilation: no semi-colon after Q_ENUM or Q_PROPERTY
Thiago Macieira [Thu, 1 Apr 2010 19:13:42 +0000 (21:13 +0200)]
Fix compilation: no semi-colon after Q_ENUM or Q_PROPERTY

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 1 Apr 2010 18:40:12 +0000 (20:40 +0200)]
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: (24 commits)
  Fix loading of _debug.dylib plugins under OSX.
  Remove strange binding loop in Repeater test.
  Improve Transform docs.
  Add media elements to the QML Elements docs.
  Doc fix
  typo
  Test cost of importing and resolving types (but not creating objects).
  Make QML 'hello world' tutorial less confusing.
  ModelNode::setObjectValue() must update the object cache.
  Doc improvements, fixes
  Remove references to deleted qmldebugger.
  Fix Rectangle::gradient rotation doc.
  Fix Flickable::visibleArea.xPosition, Flickable::visibleArea.yPosition docs
  import "." first - i.e. override it by everything else.
  Set positioner size to final size, rather than some random size mid animation
  Remove effects from element list.
  Fix imageprovider example compilation on Symbian arm
  Remove capability flag not available in public SDKs
  Fix plugin example compilation on Symbian arm
  Fix compilation on Symbian winscw
  ...

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 1 Apr 2010 18:18:42 +0000 (20:18 +0200)]
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:
  Fix regression on Symbian
  Fix broken test case
  Cleanup the deployment code
  Fix 'make sis' finding the dll on symbian
  Re-add line that was lost during webkit update.
  Work around bad naming of exported class in symbian sdk causing conflict
  Fix building on public symbian SDK.
  Fix qmake with the symbian makespec failing when project has a dash in it
  Make s60main static lib not depend on QtCore
  Remove stray non-latin1 character
  Fix out-of-source symbian build for external apps
  Update EABI def files for 4.7
  Exporting QFontDatabase::removeAllApplicationFonts()
  Adding QFontDatabase::removeAllApplicationFonts()

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Thu, 1 Apr 2010 16:15:01 +0000 (18:15 +0200)]
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: (67 commits)
  Skip tst_QGraphicsItem::updateMicroFocus test on Windows and Mac as it does not passes
  QScript: more missing APIShim
  Fix compilation warnings
  QScript: fix compilation warning
  QScript:  fix APIShim usage.
  QtScript:  remove duplicated APIshim in QScriptValueIterator
  Attempt to fix the test.
  Total makeover of SVG image reader
  Add a QGraphicsItem::updateMicroFocus() to QGraphicsItem.
  Micro optimization after feedback from Jan-Arve.
  Show only one dialog when using QFileDialog on Mac.
  Re-fix compilation: re-add symbols introduced in Qt 4.6.3 to Qt 4.7
  Fix bad merge from 4.6.
  Doc: Updated the qdoc manual with i18n info. Fixed a code example.
  Fix QStaticText test on Mac
  Support the pen set on the painter in QStaticText when using rich text
  Fix setting font for QStaticText on Linux and Mac
  Hack .pro files on windows to define QT_NO_EGL
  Fix QDate::isLeapYear() for years < 1
  One more test for chinese codecs
  ...

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 1 Apr 2010 14:22:36 +0000 (16:22 +0200)]
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: (24 commits)
  Fix loading of _debug.dylib plugins under OSX.
  Remove strange binding loop in Repeater test.
  Improve Transform docs.
  Add media elements to the QML Elements docs.
  Doc fix
  typo
  Test cost of importing and resolving types (but not creating objects).
  Make QML 'hello world' tutorial less confusing.
  ModelNode::setObjectValue() must update the object cache.
  Doc improvements, fixes
  Remove references to deleted qmldebugger.
  Fix Rectangle::gradient rotation doc.
  Fix Flickable::visibleArea.xPosition, Flickable::visibleArea.yPosition docs
  import "." first - i.e. override it by everything else.
  Set positioner size to final size, rather than some random size mid animation
  Remove effects from element list.
  Fix imageprovider example compilation on Symbian arm
  Remove capability flag not available in public SDKs
  Fix plugin example compilation on Symbian arm
  Fix compilation on Symbian winscw
  ...

8 years agoSkip tst_QGraphicsItem::updateMicroFocus test on Windows and Mac as it does not passes
Olivier Goffart [Thu, 1 Apr 2010 12:43:25 +0000 (14:43 +0200)]
Skip tst_QGraphicsItem::updateMicroFocus test on Windows and Mac as it does not passes

8 years agoQScript: more missing APIShim
Olivier Goffart [Thu, 1 Apr 2010 12:26:58 +0000 (14:26 +0200)]
QScript: more missing APIShim

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Thu, 1 Apr 2010 12:14:15 +0000 (14:14 +0200)]
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:
  Revert "adds a timeout option to QThreadPool::waitForDone();"

8 years agoFix loading of _debug.dylib plugins under OSX.
Roberto Raggi [Thu, 1 Apr 2010 10:24:10 +0000 (12:24 +0200)]
Fix loading of _debug.dylib plugins under OSX.

8 years agoFix compilation warnings
Olivier Goffart [Thu, 1 Apr 2010 09:57:12 +0000 (11:57 +0200)]
Fix compilation warnings

qdialog.cpp:261: warning: enumeral and non-enumeral type in conditional expression

Reviewed-by: Thiago
8 years agoRevert "adds a timeout option to QThreadPool::waitForDone();"
Pierre Rossi [Thu, 1 Apr 2010 09:34:10 +0000 (11:34 +0200)]
Revert "adds a timeout option to QThreadPool::waitForDone();"

This reverts commit a0df2ac07c75882618b40657e1485dda3204880e
as it induced a BC breakage.

8 years agoQScript: fix compilation warning
Olivier Goffart [Thu, 1 Apr 2010 09:28:43 +0000 (11:28 +0200)]
QScript: fix compilation warning

8 years agoQScript: fix APIShim usage.
Olivier Goffart [Thu, 1 Apr 2010 09:23:54 +0000 (11:23 +0200)]
QScript:  fix APIShim usage.

APIShim needs to be named, otherwise it is just a temporary and
the destructor is called too early

8 years agoQtScript: remove duplicated APIshim in QScriptValueIterator
Olivier Goffart [Thu, 1 Apr 2010 08:58:09 +0000 (10:58 +0200)]
QtScript:  remove duplicated APIshim in QScriptValueIterator

Added by both 7a11acd536d84ad22ef98a0fdbdb4322a55efafb and
3e5745ea75d73869918889cb374c3d651bed0991 in different branches.
in ~QScriptValueIterator and ~QScriptValueIteratorPrivate
Only one is required.

8 years agoMerge remote branch 'origin/4.7' into 4.7
Olivier Goffart [Thu, 1 Apr 2010 08:45:34 +0000 (10:45 +0200)]
Merge remote branch 'origin/4.7' into 4.7

Conflicts:
src/gui/text/qstatictext.cpp

8 years agoRemove strange binding loop in Repeater test.
Martin Jones [Thu, 1 Apr 2010 07:49:51 +0000 (17:49 +1000)]
Remove strange binding loop in Repeater test.

8 years agoImprove Transform docs.
Martin Jones [Thu, 1 Apr 2010 07:21:23 +0000 (17:21 +1000)]
Improve Transform docs.

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Martin Jones [Thu, 1 Apr 2010 06:48:35 +0000 (16:48 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

8 years agoAdd media elements to the QML Elements docs.
Martin Jones [Thu, 1 Apr 2010 06:47:19 +0000 (16:47 +1000)]
Add media elements to the QML Elements docs.

8 years agoDoc fix
Bea Lam [Thu, 1 Apr 2010 06:43:40 +0000 (16:43 +1000)]
Doc fix

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Warwick Allison [Thu, 1 Apr 2010 06:34:59 +0000 (16:34 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

8 years agotypo
Warwick Allison [Thu, 1 Apr 2010 06:33:59 +0000 (16:33 +1000)]
typo

8 years agoTest cost of importing and resolving types (but not creating objects).
Warwick Allison [Thu, 1 Apr 2010 06:09:53 +0000 (16:09 +1000)]
Test cost of importing and resolving types (but not creating objects).
Currently, by far the biggest chunk is QUrl hashing :-(

8 years agoMake QML 'hello world' tutorial less confusing.
Yann Bodson [Thu, 1 Apr 2010 05:19:55 +0000 (15:19 +1000)]
Make QML 'hello world' tutorial less confusing.

Task-number: QTBUG-9384

8 years agoModelNode::setObjectValue() must update the object cache.
Bea Lam [Thu, 1 Apr 2010 05:07:56 +0000 (15:07 +1000)]
ModelNode::setObjectValue() must update the object cache.

Task-number: QTBUG-9509

8 years agoDoc improvements, fixes
Bea Lam [Thu, 1 Apr 2010 02:49:35 +0000 (12:49 +1000)]
Doc improvements, fixes

8 years agoRemove references to deleted qmldebugger.
Bea Lam [Tue, 30 Mar 2010 02:13:57 +0000 (12:13 +1000)]
Remove references to deleted qmldebugger.

8 years agoFix Rectangle::gradient rotation doc.
Martin Jones [Thu, 1 Apr 2010 04:46:04 +0000 (14:46 +1000)]
Fix Rectangle::gradient rotation doc.

Task-number: QTBUG-9553

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Martin Jones [Thu, 1 Apr 2010 03:51:18 +0000 (13:51 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

8 years agoFix Flickable::visibleArea.xPosition, Flickable::visibleArea.yPosition docs
Martin Jones [Thu, 1 Apr 2010 03:50:27 +0000 (13:50 +1000)]
Fix Flickable::visibleArea.xPosition, Flickable::visibleArea.yPosition docs

Task-number: QTBUG-9499

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Warwick Allison [Thu, 1 Apr 2010 03:39:57 +0000 (13:39 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

8 years agoimport "." first - i.e. override it by everything else.
Warwick Allison [Thu, 1 Apr 2010 03:38:28 +0000 (13:38 +1000)]
import "." first - i.e. override it by everything else.
Otherwise, simple things break, like having "image.qml" on a case-insensitive file system.

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Martin Jones [Thu, 1 Apr 2010 02:48:03 +0000 (12:48 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

8 years agoSet positioner size to final size, rather than some random size mid animation
Martin Jones [Thu, 1 Apr 2010 02:45:57 +0000 (12:45 +1000)]
Set positioner size to final size, rather than some random size mid animation

Task-number: QTBUG-9559

8 years agoRemove effects from element list.
Martin Jones [Thu, 1 Apr 2010 02:45:36 +0000 (12:45 +1000)]
Remove effects from element list.

8 years agoFix imageprovider example compilation on Symbian arm
Joona Petrell [Thu, 1 Apr 2010 02:44:05 +0000 (12:44 +1000)]
Fix imageprovider example compilation on Symbian arm

Task-number: QTBUG-9523
Reviewed-by: Martin Jones
8 years agoRemove capability flag not available in public SDKs
Joona Petrell [Thu, 1 Apr 2010 02:42:33 +0000 (12:42 +1000)]
Remove capability flag not available in public SDKs

Task-number: QTBUG-9366
Reviewed-by: Martin Jones
8 years agoFix plugin example compilation on Symbian arm
Joona Petrell [Thu, 1 Apr 2010 02:40:48 +0000 (12:40 +1000)]
Fix plugin example compilation on Symbian arm

Task-number: QTBUG-9520
Reviewed-by: Martin Jones
8 years agoFix compilation on Symbian winscw
Joona Petrell [Thu, 1 Apr 2010 02:36:59 +0000 (12:36 +1000)]
Fix compilation on Symbian winscw

Task-number:
Reviewed-by: Aaron Kennedy
8 years agoRenamed widgets example to proxywidgets to avoid conflicts
Joona Petrell [Thu, 1 Apr 2010 02:33:10 +0000 (12:33 +1000)]
Renamed widgets example to proxywidgets to avoid conflicts

Task-number: QTBUG-9518
Reviewed-by: Martin Jones
8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 1 Apr 2010 00:59:18 +0000 (02:59 +0200)]
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:
  Fix regression on Symbian
  Fix broken test case
  Cleanup the deployment code
  Fix 'make sis' finding the dll on symbian
  Re-add line that was lost during webkit update.
  Work around bad naming of exported class in symbian sdk causing conflict
  Fix building on public symbian SDK.
  Fix qmake with the symbian makespec failing when project has a dash in it
  Make s60main static lib not depend on QtCore
  Remove stray non-latin1 character
  Fix out-of-source symbian build for external apps
  Update EABI def files for 4.7
  Exporting QFontDatabase::removeAllApplicationFonts()
  Adding QFontDatabase::removeAllApplicationFonts()

8 years agodoc - fix sellingp
Warwick Allison [Thu, 1 Apr 2010 00:42:49 +0000 (10:42 +1000)]
doc - fix sellingp

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Warwick Allison [Wed, 31 Mar 2010 23:44:10 +0000 (09:44 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

8 years agoAttempt to fix the test.
Alexis Menard [Wed, 31 Mar 2010 23:43:20 +0000 (01:43 +0200)]
Attempt to fix the test.

Reviewed-by:TrustMe

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Wed, 31 Mar 2010 23:04:48 +0000 (01:04 +0200)]
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:
  Fixed: Declared properties cannot be assigned in declaration

8 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Wed, 31 Mar 2010 20:59:55 +0000 (22:59 +0200)]
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: (43 commits)
  Fix compilation on Windows: forgot to change one toTime_tHelper
  handle qt-format PO flags
  handle encoding of PO files
  make variable naming politically correct :-D
  add Plural-Forms header in PO writer
  simplify arabic plural rule
  don't mark untranslated messages as fuzzy in PO files
  support gettext POT files
  fix writing of length variant separators in the singular case
  make PO header handling less of a monster hack
  fix updating of X-Source-Language PO header
  interpret source language "en" as "POSIX" (more precisely: "none specified")
  Fix compilation with Sun CC: no semi-colon after Q_ENUM.
  Remove the "Insert unicode control character" menu entry on X11.
  adds a timeout option to QThreadPool::waitForDone();
  Remove leading whitespace from Qt header macros.
  Rename the xxxMsecsSinceEpoch functions to xxxMSecsSinceEpoch.
  Add QDateTime members that operate on 64-bit milliseconds.
  Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct.
  qdoc: Added <div> elements to some html output for class references.
  ...

8 years agoFix compilation on Windows: forgot to change one toTime_tHelper
Thiago Macieira [Wed, 31 Mar 2010 19:12:17 +0000 (21:12 +0200)]
Fix compilation on Windows: forgot to change one toTime_tHelper

8 years agohandle qt-format PO flags
Oswald Buddenhagen [Tue, 30 Mar 2010 17:46:59 +0000 (19:46 +0200)]
handle qt-format PO flags

8 years agohandle encoding of PO files
Oswald Buddenhagen [Wed, 31 Mar 2010 12:46:30 +0000 (14:46 +0200)]
handle encoding of PO files

8 years agomake variable naming politically correct :-D
Oswald Buddenhagen [Tue, 30 Mar 2010 14:09:09 +0000 (16:09 +0200)]
make variable naming politically correct :-D