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

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

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

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

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

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

11 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

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

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

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

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

11 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

11 years agoFixed the declarative headers and includes within qdoc.
David Boddie [Tue, 5 Apr 2011 12:09:01 +0000 (14:09 +0200)]
Fixed the declarative headers and includes within qdoc.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
David Boddie [Tue, 5 Apr 2011 14:43:20 +0000 (16:43 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7

11 years agoRemoved invalid public slots section.
David Boddie [Wed, 30 Mar 2011 17:10:51 +0000 (19:10 +0200)]
Removed invalid public slots section.

Task-number: QTBUG-9316

11 years agoMinor feature fix led to refactoring for i18n's sake.
David Boddie [Wed, 30 Mar 2011 13:32:43 +0000 (15:32 +0200)]
Minor feature fix led to refactoring for i18n's sake.

Task-number: QTBUG-18397

11 years agoFixed string-int concatenation issue.
David Boddie [Tue, 29 Mar 2011 16:01:14 +0000 (18:01 +0200)]
Fixed string-int concatenation issue.

Task-number: QTBUG-18086

11 years agoMerge branch '4.7' of ../qt-doc-team-threading into 4.7
David Boddie [Tue, 5 Apr 2011 14:41:44 +0000 (16:41 +0200)]
Merge branch '4.7' of ../qt-doc-team-threading into 4.7

Conflicts:
doc/src/getting-started/tutorials.qdoc

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
Qt Continuous Integration System [Tue, 5 Apr 2011 13:33:40 +0000 (23:33 +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:
  Mac: p2 combobox regression fix

11 years agoFixed license headers for examples in 4.7
Timo Turunen [Tue, 5 Apr 2011 13:07:27 +0000 (16:07 +0300)]
Fixed license headers for examples in 4.7

All examples should carry the BSD header.

Reviewed-by: Trust Me
11 years agoMerge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Tue, 5 Apr 2011 11:56:31 +0000 (21:56 +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:
  qdoc: Allowed multiple values for certain metadata tags.

11 years agoqdoc: Allowed multiple values for certain metadata tags.
Martin Smith [Tue, 5 Apr 2011 11:41:19 +0000 (13:41 +0200)]
qdoc: Allowed multiple values for certain metadata tags.

Also output mainters for classes in the HTML output,
if there are maintainers listed.

11 years agoRemoving extra comma in `enum' declaration.
Sergio Ahumada [Tue, 5 Apr 2011 11:06:20 +0000 (13:06 +0200)]
Removing extra comma in `enum' declaration.

11 years agoTake phonon backend back in qt.iby
Guoqing Zhang [Tue, 5 Apr 2011 10:27:23 +0000 (13:27 +0300)]
Take phonon backend back in qt.iby

Task-number:
Reviewed-by: Miikka Heikkinen
11 years agoMac: p2 combobox regression fix
Richard Moe Gustavsen [Tue, 5 Apr 2011 09:19:20 +0000 (11:19 +0200)]
Mac: p2 combobox regression fix

The combobox popup on mac fails to re-highlight the last item in the
list when then mouse leaves the popup, and re-enter. We tried to fix
this in 780b4d84, but is turned out to break the cleanlooks style.
For this second try, we allow the code to set the index under mouse
when the mouse hovers an item in the list, even if the index is
current. It seems to cause low overhead, and should be safe.

Task-number: QTBUG-17738
Reviewed-by: jbache
11 years agowin32-g++: Correct the order of linked Windows libraries
Mark Brand [Tue, 5 Apr 2011 08:35:58 +0000 (10:35 +0200)]
win32-g++: Correct the order of linked Windows libraries

Commit a6d48ca corrected the problem for win32-g++. Here we do the same
for win32-g++-cross.

Merge-request: 1173
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoRemove SIGBUS emission from QNetworkSession destruction.
Cristiano di Flora [Tue, 5 Apr 2011 07:27:24 +0000 (10:27 +0300)]
Remove SIGBUS emission from QNetworkSession destruction.

Task-Number: QTBUG-17464

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Mon, 4 Apr 2011 20:06:31 +0000 (06:06 +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:
  Remove obsolete files from qt.iby

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Mon, 4 Apr 2011 16:09:30 +0000 (02:09 +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:
  win32-g++: Correct the order of linked Windows libraries
  Fixing a traling space on if statement that fails in Solaris.

11 years agoRemove obsolete files from qt.iby
Miikka Heikkinen [Mon, 4 Apr 2011 11:21:00 +0000 (14:21 +0300)]
Remove obsolete files from qt.iby

- qaudio.dll is no longer built separately, it is static part of
QtMultimedia.dll

- s60main resources are no longer needed or generated

- Webkit files are installed via separate IBY

Task-number: QT-4839
Reviewed-by: Guoqing Zhang
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Mon, 4 Apr 2011 12:45:27 +0000 (22:45 +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:
  Fix QGradient stop with NaN position on Symbian.
  Do not add project path to SYMBIAN_MATCHED_TRANSLATIONS if not needed
  QApplication does not define flag for "single touch"
  Native dialog softkeys are covered by QApplication softkeys

11 years agoFix QGradient stop with NaN position on Symbian.
Laszlo Agocs [Mon, 4 Apr 2011 11:50:16 +0000 (14:50 +0300)]
Fix QGradient stop with NaN position on Symbian.

The qbrush autotest was failing on Symbian, because gradient stops
with NaN position cannot be inserted on Symbian. This is caused by
the pos > 1 || pos < 0 check in setColorAt() which is incorrect
on ARM as NaN > 1 will evaluate to true.

Task-number: QTBUG-17874
Reviewed-by: Samuel Rødal
11 years agowin32-g++: Correct the order of linked Windows libraries
Jonathan Liu [Mon, 4 Apr 2011 11:01:48 +0000 (13:01 +0200)]
win32-g++: Correct the order of linked Windows libraries

On Windows 7, kernel32.dll exports many of the same functions as
advapi32.dll. If executables link to these functions in kernel32.dll
instead of advapi32.dll, running these executables on older versions
of Windows will cause an entry point error. This would occur due to
kernel32 being specified before advapi32.

To resolve this issue, advapi32 is specified before kernel32 when
linking.

Task-number: QTBUG-18537
Merge-request: 1169
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoFixing a traling space on if statement that fails in Solaris.
Sergio Ahumada [Mon, 4 Apr 2011 09:56:56 +0000 (11:56 +0200)]
Fixing a traling space on if statement that fails in Solaris.

64e640716204af69056c34ddac5ce26628a1edd2 broke configure in Solaris.

+ /export/home/qt/config.tests/unix/fvisibility.test g++ no
CFG_REDUCE_EXPORTS=no
+ [ no != no ]
+ [ no = auto ]
+ [ maybe = yes ]
+ [ no = yes]
configure: test: ] missing

Reviewed-by: Liang Qi
11 years agoDo not add project path to SYMBIAN_MATCHED_TRANSLATIONS if not needed
Miikka Heikkinen [Mon, 4 Apr 2011 08:58:24 +0000 (11:58 +0300)]
Do not add project path to SYMBIAN_MATCHED_TRANSLATIONS if not needed

If the path to translation file is already absolute, do not add
the $$_PRO_FILE_PWD_ to it in symbian.conf

Task-number: QT-4842
Reviewed-by: axis
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
Qt Continuous Integration System [Mon, 4 Apr 2011 09:19:06 +0000 (19:19 +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 bugfix, add widget flag MacNoCocoaChildWindow

11 years agoQApplication does not define flag for "single touch"
Sami Merila [Mon, 4 Apr 2011 08:42:29 +0000 (11:42 +0300)]
QApplication does not define flag for "single touch"

Qt application was previously not setting a native framework's flag to
indicate that is supports "single touch" (i.e. activating an item would
only need one tap, instead of one tap to highlight and another to
activate) for Sym^3.

This was causing the native dialogs launched from within the
application to behave as Sym^1 dialogs.

As a fix, set the native flag when running Qt in Sym^3.

Task-number: QT-4569
Reviewed-by: Jani Hautakangas
11 years agoNative dialog softkeys are covered by QApplication softkeys
Sami Merila [Mon, 4 Apr 2011 08:39:58 +0000 (11:39 +0300)]
Native dialog softkeys are covered by QApplication softkeys

Dialog softkeys are covered by Qt Application's Softkeys

Updating softkeys while showing a native dialog, pushes Qt application CBA
on top of dialog CBA. Therefore, native dialog can not be dismissed.

As a workaround, when gaining focus to a window, do not update application
softkeys, if there is a native dialog shown.

Task-number: QTBUG-18486
Reviewed-by: mread
11 years agoCocoa: p1 bugfix, add widget flag MacNoCocoaChildWindow
Richard Moe Gustavsen [Mon, 4 Apr 2011 08:29:40 +0000 (10:29 +0200)]
Cocoa: p1 bugfix, add widget flag MacNoCocoaChildWindow

This problem has been known for a long time, but a good solution has
never been found. The problem is that a child window should always
stay on top of it's parent, if not for anything else than secure that
a modal child does not block input while hiding behind the parent at
the same time. The only sensible solution found to ensure this in the
Cocoa port is to use Cocoa child windows. But this API has a sad side
effect; it will move the child along with the parent when the parent
is moved on screen. This is something it seems we have to live with.
But for those users that wants to handle this issue otherwise, we now
add a widget flag to switch this off.

Task-number: QTBUG-11481
Reviewed-by: msorvig
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Mon, 4 Apr 2011 05:40:43 +0000 (15:40 +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:
  Fix failing autotest
  XmlListModel should allow types other than application/xml
  Document using Behaviors with States.

11 years agoFix failing autotest
Bea Lam [Mon, 4 Apr 2011 05:21:59 +0000 (15:21 +1000)]
Fix failing autotest

Caused by 4391e2a1c35a53cc5f116926a1e5177e9ee4f51e

11 years agoXmlListModel should allow types other than application/xml
Bea Lam [Mon, 4 Apr 2011 00:17:51 +0000 (10:17 +1000)]
XmlListModel should allow types other than application/xml

application/xml is the most appropriate content type but some servers
may use other types, e.g. text/xml, so allow */* as a fallback.

Task-number: QTBUG-18005
Change-Id: I0442148233e06aacb2cbfaaf7ae624ba733d5f9a
Reviewed-by: Michael Brasser
11 years agoDocument using Behaviors with States.
Michael Brasser [Fri, 1 Apr 2011 02:53:05 +0000 (12:53 +1000)]
Document using Behaviors with States.

Change-Id: I74f163cef8caa16cccb158061ec30ffb4e471fd1
Task-number: QTBUG-16856
Reviewed-by: Bea Lam
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
Qt Continuous Integration System [Fri, 1 Apr 2011 21:03:43 +0000 (07:03 +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: (45 commits)
  Removed mobile demos from the Symbian build in demos.pro
  Fixed demo subdirs for mobile examples.
  qdoc: Updates to the qdoc manual.
  Moved a couple of links into one list.
  Doc: Work on GettingStartedQt tutorial
  Added a link to the Debugging Techniques article.
  qdoc: Updates to the qdoc manual.
  qdoc: Added a way to exclude directories from receiving default metadata
  Edited the Tutorials and Examples pages. Renamed links in index.qdoc.
  Doc: Update to QStyledItemDelegate::displayText()
  qdoc: Added default values to config file for DITA
  Doc: Work on QAudioInput::start() functions.
  Avoided the use of hard-coded file names.
  Copied the declarative parser into qdoc3 to avoid dependency issues.
  qdoc: Don't wrap <image> in <fig> if in an <xref>
  Doc: Work on a11y docs
  qdoc: Added <copyright>, <copyryear>, and <copyrholder>.
  qdoc: Completed metadata handling.
  Doc: Small update to QImageReader/Writer::supportedImageFomrmats()
  Edited QtWebKit Guide qdoc and added external links.
  ...

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Fri, 1 Apr 2011 17:23:33 +0000 (03:23 +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:
  Add the auto detection for OpenGL in configure for makefile build system on Symbian.
  Don't display softkeys/statusbar on FS childs of non-FS windows

11 years agoAdd the auto detection for OpenGL in configure for makefile build system on Symbian.
Liang Qi [Fri, 1 Apr 2011 14:26:56 +0000 (16:26 +0200)]
Add the auto detection for OpenGL in configure for makefile build system on Symbian.

Task-number: QTBUG-18485
Reviewed-by: Miikka Heikkinen
Reviewed-by: axis
11 years agoMerge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Fri, 1 Apr 2011 14:05:11 +0000 (00:05 +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:
  qdoc: modified \include to take a 2nd arg, snippet id.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Fri, 1 Apr 2011 13:14:41 +0000 (23:14 +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:
  Manually amend latin1 change
  QGraphicsItem::ItemStops[ClickFocusProgration|FocusHandling] must not interfer with touch event propagation
  suppress warnings about ASCII to QString conversion
  take the user defined temp dir into account
  Compilation break in MSVC2008 and MSVC2005
  Remove useless LFLAGS
  Add docs for QNetworkConfigurationManager's time-consuming constructor.
  rebuild configure
  fix configure.exe option -opengl desktop
  use mkdir -p for mingw+sh
  Ensure the right font is used for rendering text on Mac
  QDirIterator returns hidden directories when it should only return files
  Update Polish translations
  L10n: Update German translations.

11 years agoDon't display softkeys/statusbar on FS childs of non-FS windows
Miikka Heikkinen [Fri, 1 Apr 2011 12:58:56 +0000 (15:58 +0300)]
Don't display softkeys/statusbar on FS childs of non-FS windows

Fullscreen child windows of non-fullscreen main application window
displayed softkeys and status bar when they shouldn't. Fixed it so that
fullscreen windows never display these items (except for softkeys when
explicitly specified to do so.)

Task-number: QTTH-1207
Reviewed-by: Sami Merila
11 years agoMerge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Martin Smith [Fri, 1 Apr 2011 11:04:00 +0000 (13:04 +0200)]
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7

11 years agoqdoc: modified \include to take a 2nd arg, snippet id.
Martin Smith [Fri, 1 Apr 2011 11:03:52 +0000 (13:03 +0200)]
qdoc: modified \include to take a 2nd arg, snippet id.

11 years agoMerge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Fri, 1 Apr 2011 10:18:27 +0000 (20:18 +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:
  Removed mobile demos from the Symbian build in demos.pro

11 years agoManually amend latin1 change
Harald Fernengel [Fri, 1 Apr 2011 10:11:19 +0000 (12:11 +0200)]
Manually amend latin1 change

The result of QLatin1String + QLatin1String is a QStringBuilder object,
not a QString. Fall back to QString.arg(). Patch by Ritt Konstantin.

11 years agoRemoved mobile demos from the Symbian build in demos.pro
Jerome Pasion [Fri, 1 Apr 2011 10:03:39 +0000 (12:03 +0200)]
Removed mobile demos from the Symbian build in demos.pro

The demos require QtMobility libraries. Added notices in the
demo pages about the requirement.

Reviewed-by: Casper van Donderen
11 years agoQGraphicsItem::ItemStops[ClickFocusProgration|FocusHandling] must not interfer with...
Michael Hasselmann [Fri, 1 Apr 2011 09:27:07 +0000 (11:27 +0200)]
QGraphicsItem::ItemStops[ClickFocusProgration|FocusHandling] must not interfer with touch event propagation

Both flags are only supposed to affect focus handling but not the regular touch
event propagation. In this case, touch begin events were not propagated to any
item beneath the one carrying those flags.

Merge-request: 2588
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Fri, 1 Apr 2011 03:43:27 +0000 (13:43 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Add missing test file.
  Changing width of RTL positioner doesn't relayout
  Fix TextInput auto test failure on mac.
  PinchArea and Flickable don't work well enough together
  Fix auto test failure.
  Once Image sourceSize is set there is no way to clear it.
  Rotation transform with NaN angle can cause crash
  Canceling image download while reading causes crash
  Fix width of TextInput micro focus rectangle.

11 years agoAdd missing test file.
Martin Jones [Fri, 1 Apr 2011 03:07:31 +0000 (13:07 +1000)]
Add missing test file.

Missing from ea304fb207b681ee084c4ce9bc61d1dd847bd7b0

Change-Id: If69b16fe71c69c174968868afed5647d6ea414a8
Task-number: QTBUG-17829

11 years agoChanging width of RTL positioner doesn't relayout
Martin Jones [Fri, 1 Apr 2011 00:36:49 +0000 (10:36 +1000)]
Changing width of RTL positioner doesn't relayout

If the width of the layout changes then the items must be laid out
again.

Change-Id: I2b97bd45d07842fd3da2a0637391473ed6d78aa8
Task-number: QTBUG-18501
Reviewed-by: Michael Brasser
11 years agoFix TextInput auto test failure on mac.
Andrew den Exter [Thu, 31 Mar 2011 06:46:02 +0000 (16:46 +1000)]
Fix TextInput auto test failure on mac.

Allow for some error due to additional padding on mac.

Change-Id: Iee9ce8eb9c4cec2f96c22340162f628ffcbd44d1
Reviewed-by: Bea Lam
11 years agoPinchArea and Flickable don't work well enough together
Martin Jones [Thu, 31 Mar 2011 23:29:38 +0000 (09:29 +1000)]
PinchArea and Flickable don't work well enough together

Allow PinchArea to be more aggressive in grabbing the gesture and
keep the gesture until all touches are released.

Change-Id: Ic80b7c4c478e1ee3b1c3da0772553756d9d5473f
Task-number: QTBUG-17829
Reviewed-by: Bea Lam
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 31 Mar 2011 16:57:19 +0000 (02:57 +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:
  Do not set focus unnecessarily at window activation in Symbian
  QS60Style: Regression in drawing dialog background
  QS60Style: Support menu separator (pt.2)
  Support for new softkey in Symbian^3

11 years agoDo not set focus unnecessarily at window activation in Symbian
Miikka Heikkinen [Thu, 31 Mar 2011 12:49:46 +0000 (15:49 +0300)]
Do not set focus unnecessarily at window activation in Symbian

Calling QSymbianControl::setFocusSafely(true) on currently focused
window causes the next window in stack to get the focus momentarily,
leading to various softkey problems, such as leaving child window's
softkeys around when child is closed and flickering softkeys when child
is opened. Added a check to QWidget::activateWindow to avoid calling
setFocusSafely for already focused windows.

Task-number: QTBUG-18409
Reviewed-by: Sami Merila
Reviewed-by: axis
11 years agosuppress warnings about ASCII to QString conversion
Ritt Konstantin [Thu, 31 Mar 2011 11:39:21 +0000 (13:39 +0200)]
suppress warnings about ASCII to QString conversion

and optimize macroses to use string literal concatenation instead of .arg()

Merge-request: 1038
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
11 years agotake the user defined temp dir into account
Ritt Konstantin [Thu, 31 Mar 2011 11:39:19 +0000 (13:39 +0200)]
take the user defined temp dir into account

use user's QT_QWS_TEMP_DIR rather than hardcoded "/tmp" one

Merge-request: 1038
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
11 years agoQS60Style: Regression in drawing dialog background
Sami Merila [Thu, 31 Mar 2011 11:04:21 +0000 (14:04 +0300)]
QS60Style: Regression in drawing dialog background

Fix for QTBUG-16858 improved somewhat QComboBox menu drawing, but
unfortunately caused regression in QMenu and dialog background
drawing. These widgets shouldn't reserve space for PM_MenuVMargin.

Task-number: QTBUG-18482
Reviewed-by: Dmitry Trofimov
11 years agoCompilation break in MSVC2008 and MSVC2005
Carlos Manuel Duclos Vergara [Thu, 31 Mar 2011 09:58:11 +0000 (11:58 +0200)]
Compilation break in MSVC2008 and MSVC2005

QSKIP requires two arguments in those compilers.
Continuation of the fix to QTBUG-15421.

Task-number: QTBUG-15421
Reviewed-by: Prasanth
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Thu, 31 Mar 2011 09:55:44 +0000 (19:55 +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:
  Fixed not switching to MeeGo graphicssystem.
  Fixed rounding of coordinates pre-transformation in CG paintengine.
  Don't include qwindowsurface_gl_p.h on QT_OPENGL_ES_1.

11 years agoQS60Style: Support menu separator (pt.2)
Sami Merila [Thu, 31 Mar 2011 09:47:53 +0000 (12:47 +0300)]
QS60Style: Support menu separator (pt.2)

Additional fix for this task. Make the separator slightly less wide,
since on some themes the menu background border might be transparent
near the left and right borders.

Task-number: QTBUG-10054
Reviewed-by: Tomi Vihria
11 years agoRemove useless LFLAGS
Darryl L. Miles [Thu, 31 Mar 2011 09:16:50 +0000 (11:16 +0200)]
Remove useless LFLAGS

These options were found to be no longer required for MinGW releases at
this time (they are also never valid for MinGW64 when building 64bit).

They actually never worked anyway, as the GNU toolchain linker option
"-enable-stdcall-fixup" actually means "-e" "nable-stdcall-fixup".

Merge-request: 1158
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoAdd docs for QNetworkConfigurationManager's time-consuming constructor.
Xizhi Zhu [Fri, 25 Mar 2011 12:05:55 +0000 (14:05 +0200)]
Add docs for QNetworkConfigurationManager's time-consuming constructor.

Review-by: Iiro Kause
Task-number: QT-4313

11 years agoMerge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Thu, 31 Mar 2011 08:13:07 +0000 (18:13 +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 demo subdirs for mobile examples.
  QSoftkeyManager auto test update
  Corrected case mismatch.
  Fixed pro file syntax in demos/spectrum
  Fix for failing autotest QToolBar/Symbian
  Removed useless Exit button in Symbian^3

11 years agorebuild configure
Oswald Buddenhagen [Thu, 31 Mar 2011 08:10:59 +0000 (10:10 +0200)]
rebuild configure

11 years agofix configure.exe option -opengl desktop
Mark Brand [Thu, 31 Mar 2011 08:03:44 +0000 (10:03 +0200)]
fix configure.exe option -opengl desktop

Task-number: QTBUG-17997
Merge-request: 1161
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoMerge remote-tracking branch 'mainline/4.7' into 4.7
Oswald Buddenhagen [Thu, 31 Mar 2011 08:02:49 +0000 (10:02 +0200)]
Merge remote-tracking branch 'mainline/4.7' into 4.7

11 years agouse mkdir -p for mingw+sh
Oswald Buddenhagen [Wed, 30 Mar 2011 17:05:28 +0000 (19:05 +0200)]
use mkdir -p for mingw+sh

all other unix mkspecs do so

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Jerome Pasion [Thu, 31 Mar 2011 07:59:20 +0000 (09:59 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7

11 years agoFix auto test failure.
Andrew den Exter [Thu, 31 Mar 2011 06:22:04 +0000 (16:22 +1000)]
Fix auto test failure.

Add test file ommited from b94176e69efc3948696c6774d5a228fc753b5b29.

Change-Id: Ia5436974a4941f50c8f1636196372e5b8a90be5f

11 years agoSupport for new softkey in Symbian^3
Titta Heikkala [Wed, 30 Mar 2011 09:41:24 +0000 (12:41 +0300)]
Support for new softkey in Symbian^3

QSoftKeyManager maps the StandardSoftKey values to Symbian commands.
This way the softkeys are using Symbian defined icons.

Task-number: QT-4620
Reviewed-by: Sami Merila
11 years agoOnce Image sourceSize is set there is no way to clear it.
Martin Jones [Thu, 31 Mar 2011 00:32:26 +0000 (10:32 +1000)]
Once Image sourceSize is set there is no way to clear it.

Image sourceSize lacked a RESET method to allow reverting to the
natural size of the image.

Change-Id: I4e9089d8e16991375745db553f891bd377143eab
Task-number: QTBUG-18442
Reviewed-by: Yann Bodson
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 31 Mar 2011 00:47:30 +0000 (10:47 +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:
  QSoftkeyManager auto test update

11 years agoRotation transform with NaN angle can cause crash
Martin Jones [Wed, 30 Mar 2011 23:08:03 +0000 (09:08 +1000)]
Rotation transform with NaN angle can cause crash

When used in conjunction with Text resulted in massive memory
consunmption.

Change-Id: I5e19cb54bcd57b1ea32d17641f976f8288611a9e
Task-number: QTBUG-18386
Reviewed-by: Charles Yin
11 years agoEnsure the right font is used for rendering text on Mac
Andy Shaw [Wed, 30 Mar 2011 13:33:12 +0000 (15:33 +0200)]
Ensure the right font is used for rendering text on Mac

When ATSFontGetName() did not set name to the font name then it would
cause Qt to fall back to a font that was not the right one.  Therefore
calling ATSFontFamilyGetName() in this case will help ensure it gets the
right font.

Reviewed-by: Jiang
11 years agoFixed demo subdirs for mobile examples.
Jerome Pasion [Wed, 30 Mar 2011 13:08:58 +0000 (15:08 +0200)]
Fixed demo subdirs for mobile examples.

11 years agoQDirIterator returns hidden directories when it should only return files
Carlos Manuel Duclos Vergara [Wed, 30 Mar 2011 12:05:03 +0000 (14:05 +0200)]
QDirIterator returns hidden directories when it should only return files

In Qt 4.5.3 and earlier, creating a QDirIterator with QDir::Files |
QDir::Hidden (i.e. search for all files, including hidden files)
returned a list of all hidden and non-hidden files in a directory tree.
In Qt 4.6.0 and later the same filter causes QDirIterator to return a
list of all hidden and non-hidden files and all hidden directories. As
the user is asking only for files, clearly returning hidden directories
too is incorrect behaviour.

Similarly, when asking for QDir::Dirs | QDir::Hidden (i.e. all
directories, including hidden directories), hidden files are also
(wrongly) returned.

Task-number: QTBUG-15421
Reviewed-by: joao
11 years agoQSoftkeyManager auto test update
Titta Heikkala [Mon, 28 Mar 2011 08:49:04 +0000 (11:49 +0300)]
QSoftkeyManager auto test update

Updated correct values to simulateSymbianCommand function calls. It is
defined in QSoftKeyManagerPrivateS60 that left and right softkeys are
0 and 2, now these values are used in test also.
The signal spy actions have been updated to track the correct
button in checkSoftkeyEnableStates-function.

Task-number: QTBUG-18375
Reviewed-by: Sami Merila
11 years agoMerge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Wed, 30 Mar 2011 11:09:36 +0000 (21:09 +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:
  qdoc: Updates to the qdoc manual.
  Return correct boundaries reasons from QTextBoundaryFinder.
  GridView jumps to beginning of list when resized
  Update changes for 4.7.3
  QMeeGoLivePixmapData: Verify dimensions of locked pixmap
  directfb: avoid version dependency by setting DSPD_DST blend functions manually
  fix -enable-stdcall-fixup usage
  Report that an update is needed if no update was done

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Jerome Pasion [Wed, 30 Mar 2011 10:16:37 +0000 (12:16 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Jerome Pasion [Wed, 30 Mar 2011 09:59:37 +0000 (11:59 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7

11 years agoMerge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Martin Smith [Wed, 30 Mar 2011 09:57:36 +0000 (11:57 +0200)]
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7

11 years agoqdoc: Updates to the qdoc manual.
Martin Smith [Wed, 30 Mar 2011 09:57:26 +0000 (11:57 +0200)]
qdoc: Updates to the qdoc manual.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 30 Mar 2011 09:01:55 +0000 (19:01 +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:
  Corrected case mismatch.
  Fixed pro file syntax in demos/spectrum
  Fix for failing autotest QToolBar/Symbian
  Removed useless Exit button in Symbian^3

11 years agoFixed not switching to MeeGo graphicssystem.
Samuel Rødal [Wed, 30 Mar 2011 08:41:46 +0000 (10:41 +0200)]
Fixed not switching to MeeGo graphicssystem.

If two windows become maximized at once we might not switch, this is an
attempt at fixing that.

Reviewed-by: Armin Berres
11 years agoCanceling image download while reading causes crash
Martin Jones [Wed, 30 Mar 2011 04:09:56 +0000 (14:09 +1000)]
Canceling image download while reading causes crash

We were deleting a QObject owned by another thread, which is fine if
there are no pending events, but very bad if there are, e.g.
queued signals due to downloadProgress() updates.  Use deleteLater()
which is safe to call in any thread.
Also call QDeclarativePixmap::clear(QObject *obj) where appropriate
to remove connections and ensure we don't handle any unwanted signals
after the download is cancelled.

Change-Id: Ia8fb41a8cd004d9840e7cec35915f1afdb03ac4d
Task-number: QTBUG-18412
Reviewed-by: Aaron Kennedy