qt:qt-palm-pre.git
8 years agoMerge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kineti...
Aaron Kennedy [Thu, 14 Jan 2010 07:07:23 +0000 (17:07 +1000)]
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

8 years agoOnly force graphicssystem raster on X11
Aaron Kennedy [Thu, 14 Jan 2010 07:03:22 +0000 (17:03 +1000)]
Only force graphicssystem raster on X11

8 years agoRef bug
Warwick Allison [Thu, 14 Jan 2010 06:55:03 +0000 (16:55 +1000)]
Ref bug

8 years agodoc
Warwick Allison [Thu, 14 Jan 2010 06:49:06 +0000 (16:49 +1000)]
doc

8 years agomissed file
Warwick Allison [Thu, 14 Jan 2010 06:27:36 +0000 (16:27 +1000)]
missed file
(fix test)

8 years agoFix tst_qmlgraphicstext::letterSpacing tst_qmlgraphicstext::wordSpacing
Warwick Allison [Thu, 14 Jan 2010 06:13:10 +0000 (16:13 +1000)]
Fix tst_qmlgraphicstext::letterSpacing tst_qmlgraphicstext::wordSpacing
Sent for review into 4.6.

Task-number: QTBUG-7326

8 years agoMore statechange debugging
Aaron Kennedy [Thu, 14 Jan 2010 05:56:53 +0000 (15:56 +1000)]
More statechange debugging

8 years agoFollow change 87a939fa289a0d96c1f0eb10fa74b1cb89fc05f1
Warwick Allison [Thu, 14 Jan 2010 05:19:16 +0000 (15:19 +1000)]
Follow change 87a939fa289a0d96c1f0eb10fa74b1cb89fc05f1

8 years agoSupport calling in QScriptDeclarativeClass
Aaron Kennedy [Thu, 14 Jan 2010 04:18:55 +0000 (14:18 +1000)]
Support calling in QScriptDeclarativeClass

8 years agocompile
Warwick Allison [Thu, 14 Jan 2010 04:03:39 +0000 (14:03 +1000)]
compile

8 years agoMore clarity if test fails.
Warwick Allison [Thu, 14 Jan 2010 03:29:21 +0000 (13:29 +1000)]
More clarity if test fails.

8 years agoMore benchmark cleanup.
Michael Brasser [Thu, 14 Jan 2010 03:22:19 +0000 (13:22 +1000)]
More benchmark cleanup.

8 years agoMerge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kineti...
Michael Brasser [Thu, 14 Jan 2010 02:59:33 +0000 (12:59 +1000)]
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

8 years agoBenchmark cleanup.
Michael Brasser [Thu, 14 Jan 2010 02:27:18 +0000 (12:27 +1000)]
Benchmark cleanup.

8 years agoMerge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declarativeui
Warwick Allison [Thu, 14 Jan 2010 00:31:37 +0000 (10:31 +1000)]
Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declarativeui

Conflicts:
bin/syncqt
src/corelib/io/qurl.cpp

8 years agoUpdate pointer benchmark to use QmlGuard rather than QGuard.
Michael Brasser [Thu, 14 Jan 2010 00:27:24 +0000 (10:27 +1000)]
Update pointer benchmark to use QmlGuard rather than QGuard.

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
Qt Continuous Integration System [Wed, 13 Jan 2010 19:01:50 +0000 (20:01 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
  Use a QTextBrowser instead of a read only QTextEdit

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Wed, 13 Jan 2010 16:06:10 +0000 (17:06 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  tst_qnetworkreply benchmark: Properly finish the thread
  QSslSocket: Remove writeBuffer,readBuffer and use from QAbstractSocket
  doc: This bug wasn't really a bug; it just required clarification.
  Update my changelog for 4.6.1
  My changes for 4.6.1
  Remove erroneous warning in QFileInfo::absolutePath()
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8b9165d3bc84d1c8cc7df49a191cc3857b5530d4 )

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Simon Hausmann [Wed, 13 Jan 2010 16:02:05 +0000 (17:02 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6

Conflicts:
dist/changes-4.6.1

8 years agoUse a QTextBrowser instead of a read only QTextEdit
Harald Fernengel [Tue, 12 Jan 2010 13:48:53 +0000 (14:48 +0100)]
Use a QTextBrowser instead of a read only QTextEdit

... to display the extra text content. This works well on Maemo
and on S60, and has the added benefit that external URLs (like in
aboutQt) are opened correctly.

Reviewed-By: Jason Barron
8 years agotst_qnetworkreply benchmark: Properly finish the thread
Markus Goetz [Wed, 13 Jan 2010 13:23:14 +0000 (14:23 +0100)]
tst_qnetworkreply benchmark: Properly finish the thread

End the thread at the proper point, before possibly failing
one of the test conditions.

Reviewed-by: TrustMe
8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
Qt Continuous Integration System [Wed, 13 Jan 2010 13:02:58 +0000 (14:02 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (22 commits)
  really, *really* fix the test :}
  QFile cannot deal with crlf-translated stdio, so use binary mode
  remove trimming of (expected) output
  really fix the autotest
  support regexp-like quantifiers of expected output lines
  remove superfluous \r filtering
  print actual rather than expected output for matching text
  Do not set the font size unnecessarily in the simulated s60 style.
  Doc typos fixed
  Translations: Update German for 4.6.1
  fix test under windows
  don't complain about unresolved base when the reference is absolute
  make the lupdate tests more verbose in case of failure
  don't use qmake for test setup
  move equivalent of output_ts test to good/
  look for the .result file in the dir where the output is expected to go
  fix sametext and number heuristics
  fix number heuristics, part 1
  no point in specifying -ts when a .pro file is specified
  clean up the lupdatecmd files
  ...

8 years agoQSslSocket: Remove writeBuffer,readBuffer and use from QAbstractSocket
Markus Goetz [Tue, 12 Jan 2010 13:35:05 +0000 (14:35 +0100)]
QSslSocket: Remove writeBuffer,readBuffer and use from QAbstractSocket

We're using the ones from our parent class instead of own instance.

Reviewed-by: Thiago
Reviewed-by: joao
8 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Martin Smith [Wed, 13 Jan 2010 12:14:37 +0000 (13:14 +0100)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6

8 years agodoc: This bug wasn't really a bug; it just required clarification.
Martin Smith [Wed, 13 Jan 2010 12:13:07 +0000 (13:13 +0100)]
doc: This bug wasn't really a bug; it just required clarification.

The reported bug was actually not a bug. It is ok to pass the enum
value as a string here, because the enumeration type has been
registered with the meta-object system with the Q_ENUMS()
macro. However, I have added a bit of text to clarify things a bit.

Task-number:    QTBUG-7158

8 years agoUpdate my changelog for 4.6.1
Thiago Macieira [Wed, 13 Jan 2010 11:39:16 +0000 (12:39 +0100)]
Update my changelog for 4.6.1

8 years agoMy changes for 4.6.1
Thiago Macieira [Wed, 13 Jan 2010 11:21:09 +0000 (12:21 +0100)]
My changes for 4.6.1

8 years agoRemove erroneous warning in QFileInfo::absolutePath()
Andreas Kling [Wed, 13 Jan 2010 09:37:10 +0000 (10:37 +0100)]
Remove erroneous warning in QFileInfo::absolutePath()

QFileInfo().absolutePath() is legal and shouldn't produce a warning.

Reviewed-by: João Abecasis
8 years agoMerge remote branch 'mainline/4.6' into 4.6
Oswald Buddenhagen [Wed, 13 Jan 2010 10:39:21 +0000 (11:39 +0100)]
Merge remote branch 'mainline/4.6' into 4.6

Conflicts:
tests/auto/linguist/lupdate/testlupdate.cpp

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Wed, 13 Jan 2010 10:07:42 +0000 (11:07 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (26 commits)
  Fixed tst_qgl multipleFBOInterleavedRendering.
  Update autotest database connection settings
  SQL 4.6.1 changelog
  My changes
  Significant digits were lost in QDoubleSpinBox range when changing precision
  My changelog for 4.6.1.
  Added my changes to the 4.6.1 change log.
  Put LinesHint into QVectorPath hints to enable further optimizations
  Update changes file for 4.6.1
  Avoid coordinate limitations in the raster engine.
  Update changelog with my 4.6.1 changes.
  4.6.1 changes
  Fixed bug where QGLPixmapData::toImage() returned too dark image.
  Update change log with Yoann Lopes work.
  Fix completion in QFileDialog.
  Fix point drawing on raster engine for flat and square caps
  Update changes file with Rhys Weatherley's work.
  warning fixes for platforms, where qreal == float
  fix release mode crash in qfont.cpp initFontSubst() on Windows mobile
  Fixed justify aligned text drawing with the GL1 engine.
  ...

8 years agoFixed tst_qgl multipleFBOInterleavedRendering.
Samuel Rødal [Wed, 13 Jan 2010 09:31:38 +0000 (10:31 +0100)]
Fixed tst_qgl multipleFBOInterleavedRendering.

We need to clobber the vertex attribute pointers _before_ we call
setState() to regenerate the clip, or we'll use invalid vertex
pointers when writing the clip.

Reviewed-by: Paul
8 years agoUpdated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8b9165...
Simon Hausmann [Wed, 13 Jan 2010 09:21:04 +0000 (10:21 +0100)]
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8b9165d3bc84d1c8cc7df49a191cc3857b5530d4 )

Changes in WebKit/qt since the last update:

* Cherry-pick of http://trac.webkit.org/changeset/53181
  ( http://bugreports.qt.nokia.com/browse/QTBUG-7290 )

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-integration
Qt Continuous Integration System [Wed, 13 Jan 2010 06:55:56 +0000 (07:55 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team:
  Fix example in QAudioOutput/QAudioInput docs

8 years agoUpdate autotest database connection settings
Bill King [Wed, 13 Jan 2010 05:04:55 +0000 (15:04 +1000)]
Update autotest database connection settings

8 years agoTest fix in 4accb53cc2f9e2e89fda91a20e3c0503cf10aad0
Warwick Allison [Wed, 13 Jan 2010 04:31:31 +0000 (14:31 +1000)]
Test fix in 4accb53cc2f9e2e89fda91a20e3c0503cf10aad0

8 years agoMerge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into...
Warwick Allison [Wed, 13 Jan 2010 04:25:55 +0000 (14:25 +1000)]
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

8 years agoVersion "-1" means not-specified.
Warwick Allison [Wed, 13 Jan 2010 04:25:21 +0000 (14:25 +1000)]
Version "-1" means not-specified.

8 years agoSQL 4.6.1 changelog
Bill King [Wed, 13 Jan 2010 04:21:45 +0000 (14:21 +1000)]
SQL 4.6.1 changelog

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Wed, 13 Jan 2010 04:03:05 +0000 (05:03 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (23 commits)
  My changes
  Significant digits were lost in QDoubleSpinBox range when changing precision
  My changelog for 4.6.1.
  Added my changes to the 4.6.1 change log.
  Put LinesHint into QVectorPath hints to enable further optimizations
  Update changes file for 4.6.1
  Avoid coordinate limitations in the raster engine.
  Update changelog with my 4.6.1 changes.
  4.6.1 changes
  Fixed bug where QGLPixmapData::toImage() returned too dark image.
  Update change log with Yoann Lopes work.
  Fix completion in QFileDialog.
  Fix point drawing on raster engine for flat and square caps
  Update changes file with Rhys Weatherley's work.
  warning fixes for platforms, where qreal == float
  fix release mode crash in qfont.cpp initFontSubst() on Windows mobile
  Fixed justify aligned text drawing with the GL1 engine.
  Add odf-writer benchmark.
  Fixed subpixel antialiased text drawing with the GL2 engine.
  Fixes warning in the QMacStyle
  ...

8 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6
Kurt Korbatits [Wed, 13 Jan 2010 04:02:40 +0000 (14:02 +1000)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6

8 years agoFix example in QAudioOutput/QAudioInput docs
Kurt Korbatits [Wed, 13 Jan 2010 04:01:13 +0000 (14:01 +1000)]
Fix example in QAudioOutput/QAudioInput docs
Fixed error in doc comments.

Reviewed-by:Justin McPherson

8 years agoFix tests after 05adc294d063171d9d0accf819826684813d396a
Michael Brasser [Wed, 13 Jan 2010 02:48:18 +0000 (12:48 +1000)]
Fix tests after 05adc294d063171d9d0accf819826684813d396a

8 years agoRemove QByteArray constructor from QmlComponent.
Michael Brasser [Wed, 13 Jan 2010 02:20:11 +0000 (12:20 +1000)]
Remove QByteArray constructor from QmlComponent.

It was too easily confused with the QString constructor that had
completely different semantics. Use setData() instead.

Task-number: QTBUG-6590

8 years agoAdd basic support for property iteration.
Michael Brasser [Tue, 12 Jan 2010 06:32:12 +0000 (16:32 +1000)]
Add basic support for property iteration.

Task-number: QTBUG-6033

8 years agoRemove duplicate line.
Michael Brasser [Tue, 12 Jan 2010 06:29:19 +0000 (16:29 +1000)]
Remove duplicate line.

8 years agoFix and test version 0.0 installed imports.
Warwick Allison [Wed, 13 Jan 2010 01:11:07 +0000 (11:11 +1000)]
Fix and test version 0.0 installed imports.

8 years agoGive full error message (with line number) on XMLHttpRequest slot failures.
Warwick Allison [Wed, 13 Jan 2010 01:07:59 +0000 (11:07 +1000)]
Give full error message (with line number) on XMLHttpRequest slot failures.

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Wed, 13 Jan 2010 01:00:53 +0000 (02:00 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  QtWebKit changelog for Qt 4.6.1
  Make compile on HPUX
  Modifies the google chat example to use the DOM API

8 years agoTest version 0.0
Warwick Allison [Wed, 13 Jan 2010 00:17:41 +0000 (10:17 +1000)]
Test version 0.0

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Tue, 12 Jan 2010 22:04:20 +0000 (23:04 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (23 commits)
  My changes
  Significant digits were lost in QDoubleSpinBox range when changing precision
  My changelog for 4.6.1.
  Added my changes to the 4.6.1 change log.
  Put LinesHint into QVectorPath hints to enable further optimizations
  Update changes file for 4.6.1
  Avoid coordinate limitations in the raster engine.
  Update changelog with my 4.6.1 changes.
  4.6.1 changes
  Fixed bug where QGLPixmapData::toImage() returned too dark image.
  Update change log with Yoann Lopes work.
  Fix completion in QFileDialog.
  Fix point drawing on raster engine for flat and square caps
  Update changes file with Rhys Weatherley's work.
  warning fixes for platforms, where qreal == float
  fix release mode crash in qfont.cpp initFontSubst() on Windows mobile
  Fixed justify aligned text drawing with the GL1 engine.
  Add odf-writer benchmark.
  Fixed subpixel antialiased text drawing with the GL2 engine.
  Fixes warning in the QMacStyle
  ...

8 years agoQtWebKit changelog for Qt 4.6.1
Simon Hausmann [Tue, 12 Jan 2010 20:57:13 +0000 (21:57 +0100)]
QtWebKit changelog for Qt 4.6.1

From qtwebkit-4.6.0 to de77f8ee69c434bde9306c8f407ee2e443a00188

8 years agoMerge remote branch 'qt/4.6' into oslo-staging-2/4.6
Paul Olav Tvete [Tue, 12 Jan 2010 19:20:01 +0000 (20:20 +0100)]
Merge remote branch 'qt/4.6' into oslo-staging-2/4.6

Conflicts:
dist/changes-4.6.1

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Tue, 12 Jan 2010 19:09:19 +0000 (20:09 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Added absolute path to sqlite3.sis in s60installs.pro
  Added changelog entries.
  Added enable/disable parameter to each effect in Phonon MMF backend
  Simplified error handling for audio effects
  Implemented stereo widening effect in Phonon MMF backend
  Implemented reverb effect in Phonon MMF backend
  Implemented loudness effect in Phonon MMF backend
  Implemented bass boost in Phonon MMF backend
  Refactored AbstractAudioEffect to reduce redundancy in derived classes
  Removed unnecessary check in Phonon MMF backend
  Added a macro to reduce boilerplate code in Phonon MMF backend
  Removed dependency of EffectFactory on native effect headers
  Delayed creation of audio effect object until audio is initialized
  Modified effect parameter handling to improve user experience
  Added comments to clarify usage of Phonon::EffectParameter API
  Shortened description of audio equalizer bands
  Implemented audio effects capability querying in Phonon MMF backend
  Corrected parameter name ordering in internal Phonon MMF function signatures
  Fixed typo in Phonon::EffectWidget implementation

8 years agoMake compile on HPUX
Pierre Rossi [Mon, 11 Jan 2010 14:10:17 +0000 (15:10 +0100)]
Make compile on HPUX

Reviewed-by: axis
8 years agoModifies the google chat example to use the DOM API
Pierre Rossi [Thu, 7 Jan 2010 12:25:23 +0000 (13:25 +0100)]
Modifies the google chat example to use the DOM API

Now that it's there, we might as well use it!

Reviewed-by: Benjamin Poulain
8 years agoreally, *really* fix the test :}
Oswald Buddenhagen [Tue, 12 Jan 2010 16:00:00 +0000 (17:00 +0100)]
really, *really* fix the test :}

stupid testr ... and me.

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Tue, 12 Jan 2010 15:51:54 +0000 (16:51 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (87 commits)
  Fix D-Bus calls with QDBus::BlockWithGui.
  Fixes:    Add some changes for 4.6.1
  Skip tst_QSystemLock::processes
  Autotest: set these files to executable. They are CGI scripts.
  Fix an issue with HTTP headers like "private, max-age=300".
  Autotest: don't depend on QtGui just because of QDesktopServices::storageLocation
  My changes to changes-4.6.1
  my changelog for 4.6.1
  Revert "Fixed qxmlstream autotest when using shadow builds."
  Changed log updated
  doc: Updated the descriptions of the connection types.
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( bd6591b4acaf2172ab05702153ef539c0ac89cbb )
  Update changelog with some of my stuff
  my 4.6.1 changelog contributions
  doc: update snippets for QtScript function expressions
  Prevent a crash when creating an inputContext from the QApplication dtor.
  QNAM HTTP Code: Cache socket state inside ensureConnection()
  tst_qhttpnetworkconnection: Test also HEAD in some tests
  tst_qhttpnetworkconnection: Relax condition in getMultipleWithPriorities
  QNAM HTTP Code: When starting new request, prefer connected sockets.
  ...

8 years agoFix D-Bus calls with QDBus::BlockWithGui.
Thiago Macieira [Tue, 12 Jan 2010 15:14:07 +0000 (16:14 +0100)]
Fix D-Bus calls with QDBus::BlockWithGui.

We must wait for a reply in case the reply hasn't been received yet,
not if it has already been received. Simple typo.

Task-number: QT-2307
Reviewed-by: Trust Me
8 years agoFixes: Add some changes for 4.6.1
Jens Bache-Wiig [Tue, 12 Jan 2010 15:13:16 +0000 (16:13 +0100)]
Fixes:    Add some changes for 4.6.1

8 years agoSkip tst_QSystemLock::processes
Simon Hausmann [Tue, 12 Jan 2010 15:10:40 +0000 (16:10 +0100)]
Skip tst_QSystemLock::processes

This test is currently taking 15 minutes to execute, slowing down the
entire Qt integration. It needs to be trimmed down before re-enabling it.

Reviewed-by: Paul
8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Jan-Arve Sæther [Tue, 12 Jan 2010 14:53:58 +0000 (15:53 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6

8 years agoMy changes
Jan-Arve Sæther [Tue, 12 Jan 2010 14:53:27 +0000 (15:53 +0100)]
My changes

8 years agoAutotest: set these files to executable. They are CGI scripts.
Thiago Macieira [Tue, 12 Jan 2010 14:52:11 +0000 (15:52 +0100)]
Autotest: set these files to executable. They are CGI scripts.

Reviewed-by: Trust Me
8 years agoFix an issue with HTTP headers like "private, max-age=300".
Thiago Macieira [Tue, 12 Jan 2010 14:20:28 +0000 (15:20 +0100)]
Fix an issue with HTTP headers like "private, max-age=300".

The parsing would ignore the fact that "private" ended at the comma
and would instead try to get the continuation as the value.

We have to check if equal < comma and it's not -1. Using unsigned
comparisons does both things at once for us.

Task-number: QTBUG-7060
Reviewed-by: Peter Hartmann
8 years agoAutotest: don't depend on QtGui just because of QDesktopServices::storageLocation
Thiago Macieira [Tue, 12 Jan 2010 14:19:45 +0000 (15:19 +0100)]
Autotest: don't depend on QtGui just because of QDesktopServices::storageLocation

Task-number: QTBUG-7060
Reviewed-by: Trust Me
8 years agoSignificant digits were lost in QDoubleSpinBox range when changing precision
Gabriel de Dietrich [Tue, 12 Jan 2010 14:09:42 +0000 (15:09 +0100)]
Significant digits were lost in QDoubleSpinBox range when changing precision

When setting the range, the actual value precision was lost because the min
and max were saved after being formatted to the current precison (decimals
property), thus losing information. We now keep the user original values, and
use these whenever the decimals property is changed. Auto-test included.

Reviewed-by: leo
Task-number: QTBUG-6496

8 years agoMy changelog for 4.6.1.
Alexis Menard [Tue, 12 Jan 2010 14:30:36 +0000 (15:30 +0100)]
My changelog for 4.6.1.

8 years agoAdded my changes to the 4.6.1 change log.
Kim Motoyoshi Kalland [Tue, 12 Jan 2010 14:09:56 +0000 (15:09 +0100)]
Added my changes to the 4.6.1 change log.

8 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Gunnar Sletta [Tue, 12 Jan 2010 14:26:51 +0000 (15:26 +0100)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6

8 years agoPut LinesHint into QVectorPath hints to enable further optimizations
Gunnar Sletta [Tue, 12 Jan 2010 14:24:18 +0000 (15:24 +0100)]
Put LinesHint into QVectorPath hints to enable further optimizations

Reviewed-by: Samuel
8 years agoUpdate changes file for 4.6.1
Tom Cooksey [Tue, 12 Jan 2010 14:21:32 +0000 (15:21 +0100)]
Update changes file for 4.6.1

8 years agoMy changes to changes-4.6.1
Richard Moe Gustavsen [Tue, 12 Jan 2010 14:22:15 +0000 (15:22 +0100)]
My changes to changes-4.6.1

8 years agoAvoid coordinate limitations in the raster engine.
Gunnar Sletta [Tue, 12 Jan 2010 14:13:46 +0000 (15:13 +0100)]
Avoid coordinate limitations in the raster engine.

Lines that are longer than 2^15 will overflow in qgrayraster.c
so we need to clip them. Also, we need to clip the bounding
rectangle to avoid an endless clip-loop

Task: http://bugreports.qt.nokia.com/browse/QTBUG-6198
Reviewed-by: Samuel
8 years agomy changelog for 4.6.1
Peter Hartmann [Tue, 12 Jan 2010 13:57:17 +0000 (14:57 +0100)]
my changelog for 4.6.1

8 years agoUpdate changelog with my 4.6.1 changes.
Samuel Rødal [Tue, 12 Jan 2010 13:52:38 +0000 (14:52 +0100)]
Update changelog with my 4.6.1 changes.

8 years ago4.6.1 changes
Trond Kjernåsen [Tue, 12 Jan 2010 13:55:01 +0000 (14:55 +0100)]
4.6.1 changes

8 years agoRevert "Fixed qxmlstream autotest when using shadow builds."
Prasanth Ullattil [Tue, 12 Jan 2010 13:53:30 +0000 (14:53 +0100)]
Revert "Fixed qxmlstream autotest when using shadow builds."

This reverts commit f8780558e3fc68321a0dd6dcef611eeee0805a2e.

8 years agoMerge commit 'origin/mmfphonon' into 4.6
Gareth Stockwell [Tue, 12 Jan 2010 13:31:15 +0000 (13:31 +0000)]
Merge commit 'origin/mmfphonon' into 4.6

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
Qt Continuous Integration System [Tue, 12 Jan 2010 12:42:50 +0000 (13:42 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (21 commits)
  QFile cannot deal with crlf-translated stdio, so use binary mode
  remove trimming of (expected) output
  really fix the autotest
  support regexp-like quantifiers of expected output lines
  remove superfluous \r filtering
  print actual rather than expected output for matching text
  Do not set the font size unnecessarily in the simulated s60 style.
  Doc typos fixed
  Translations: Update German for 4.6.1
  fix test under windows
  don't complain about unresolved base when the reference is absolute
  make the lupdate tests more verbose in case of failure
  don't use qmake for test setup
  move equivalent of output_ts test to good/
  look for the .result file in the dir where the output is expected to go
  fix sametext and number heuristics
  fix number heuristics, part 1
  no point in specifying -ts when a .pro file is specified
  clean up the lupdatecmd files
  tidy up the test .pro files
  ...

8 years agoFixed bug where QGLPixmapData::toImage() returned too dark image.
Kim Motoyoshi Kalland [Tue, 12 Jan 2010 12:29:11 +0000 (13:29 +0100)]
Fixed bug where QGLPixmapData::toImage() returned too dark image.

QGLPixmapData::toImage() called qt_gl_read_texture() which didn't take
into account that the texture was in a premultiplied format.

Task-number: QTBUG-7190
Reviewed-by: Trond
8 years agoChanged log updated
Prasanth Ullattil [Tue, 12 Jan 2010 12:13:35 +0000 (13:13 +0100)]
Changed log updated

8 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Martin Smith [Tue, 12 Jan 2010 12:13:34 +0000 (13:13 +0100)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6

8 years agodoc: Updated the descriptions of the connection types.
Martin Smith [Tue, 12 Jan 2010 12:09:31 +0000 (13:09 +0100)]
doc: Updated the descriptions of the connection types.

Replaced the ambiguous "delivered" with the explanation that the
blocking queued connection type blocks the emitter's thread until
the slot finishes executing in the receiver's thread.

Task-number:    QTBUG-6392

8 years agoUpdate change log with Yoann Lopes work.
Yoann Lopes [Tue, 12 Jan 2010 11:32:09 +0000 (12:32 +0100)]
Update change log with Yoann Lopes work.

8 years agoQFile cannot deal with crlf-translated stdio, so use binary mode
Oswald Buddenhagen [Tue, 12 Jan 2010 11:28:57 +0000 (12:28 +0100)]
QFile cannot deal with crlf-translated stdio, so use binary mode

of course, this will break if somebody actually pipes in windows files.
oh, well.

Suggested-by: joao
8 years agoUpdated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( bd6591...
Simon Hausmann [Tue, 12 Jan 2010 11:28:22 +0000 (12:28 +0100)]
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( bd6591b4acaf2172ab05702153ef539c0ac89cbb )

Changes in WebKit/qt since the last update:

++ b/WebKit/qt/ChangeLog
2009-12-18  Joe Ligman  <joseph.ligman@nokia.com>

        Reviewed by Kenneth Rohde Christiansen.

        [Qt] Add new API to QWebFrame to scrollRecursively starting with any css overflow
        then checking current frame and then ancestors
        https://bugs.webkit.org/show_bug.cgi?id=32668

        * Api/qwebframe.cpp:
        (QWebFramePrivate::scrollOverflow):
        (QWebFrame::scrollRecursively):
        * Api/qwebframe.h:
        * Api/qwebframe_p.h:
        * tests/qwebframe/qwebframe.qrc:
        * tests/qwebframe/testiframe.html: Added.
        * tests/qwebframe/testiframe2.html: Added.
        * tests/qwebframe/tst_qwebframe.cpp:

8 years agoremove trimming of (expected) output
Oswald Buddenhagen [Tue, 12 Jan 2010 11:16:12 +0000 (12:16 +0100)]
remove trimming of (expected) output

it's needless and potentially detrimental

8 years agoreally fix the autotest
Oswald Buddenhagen [Tue, 12 Jan 2010 11:15:52 +0000 (12:15 +0100)]
really fix the autotest

8 years agosupport regexp-like quantifiers of expected output lines
Oswald Buddenhagen [Tue, 12 Jan 2010 11:14:24 +0000 (12:14 +0100)]
support regexp-like quantifiers of expected output lines

makes platform-specific optional output possible

8 years agoremove superfluous \r filtering
Oswald Buddenhagen [Mon, 11 Jan 2010 12:48:59 +0000 (13:48 +0100)]
remove superfluous \r filtering

we are opening the files/processes in text mode already

8 years agoprint actual rather than expected output for matching text
Oswald Buddenhagen [Mon, 11 Jan 2010 12:48:27 +0000 (13:48 +0100)]
print actual rather than expected output for matching text

the expected may contain regular expressions.

8 years agoUpdate changelog with some of my stuff
Markus Goetz [Tue, 12 Jan 2010 11:14:41 +0000 (12:14 +0100)]
Update changelog with some of my stuff

8 years agoAdded absolute path to sqlite3.sis in s60installs.pro
Miikka Heikkinen [Tue, 12 Jan 2010 10:29:35 +0000 (12:29 +0200)]
Added absolute path to sqlite3.sis in s60installs.pro

Relative path was only working when package was created from
s60installs directory. Binary installer creation requires package
creation to work also from Qt root, so added absolute path to
sqlite3.sis.

Task-number: QTBUG-7275
Reviewed-by: Janne Anttila
8 years agomy 4.6.1 changelog contributions
Bradley T. Hughes [Tue, 12 Jan 2010 10:31:34 +0000 (11:31 +0100)]
my 4.6.1 changelog contributions

8 years agoMerge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kineti...
Aaron Kennedy [Tue, 12 Jan 2010 09:49:44 +0000 (19:49 +1000)]
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

8 years agoIncorrect ASSERT
Aaron Kennedy [Tue, 12 Jan 2010 09:48:55 +0000 (19:48 +1000)]
Incorrect ASSERT

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Tue, 12 Jan 2010 09:42:00 +0000 (10:42 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (73 commits)
  doc: update snippets for QtScript function expressions
  Prevent a crash when creating an inputContext from the QApplication dtor.
  QNAM HTTP Code: Cache socket state inside ensureConnection()
  tst_qhttpnetworkconnection: Test also HEAD in some tests
  tst_qhttpnetworkconnection: Relax condition in getMultipleWithPriorities
  QNAM HTTP Code: When starting new request, prefer connected sockets.
  typo fix
  Added the 'framecapture' WebKit example to the default build.
  Fix code example
  fix typo in qreadwritelock's documentation
  QNAM HTTP: Don't call d_func() so often
  QNAM HTTP: Fix readBuffer maximum size.
  QNAM HTTP: Optimize eatWhitespace()
  QNAM HTTP: Check if socket already tries to connect.
  network internals: fix build on S60
  [syncqt] Make -separate-module work with WebKit's directory structure
  doc: Corrected explanation of when append() does nothing.
  doc: Added clarification about allocating space for the 0 terminator.
  Add a way to access the normalised URL in QUrl.
  [syncqt] Make it possible to synchronize headers for a separate module
  ...

8 years agoFix completion in QFileDialog.
Alexis Menard [Tue, 12 Jan 2010 09:35:26 +0000 (10:35 +0100)]
Fix completion in QFileDialog.

Completing under the root directory was "eating" the first letter. On
windows under C:\ the completion was not working at all.

Task-number: QTBUG-4933
Reviewed-by:janarve
Reviewed-by:gabi

8 years agodoc: update snippets for QtScript function expressions
Kent Hansen [Tue, 12 Jan 2010 09:03:50 +0000 (10:03 +0100)]
doc: update snippets for QtScript function expressions

With the JSC-based back-end it's necessary to wrap the function
in parentheses.

Task-number: QTBUG-6644

8 years agoPrevent a crash when creating an inputContext from the QApplication dtor.
Simon Hausmann [Tue, 12 Jan 2010 08:42:00 +0000 (09:42 +0100)]
Prevent a crash when creating an inputContext from the QApplication dtor.

Complete the fix in f72165460d27860cabd51691f4d935fd74b50f80 by applying
the same fix to Symbian and QWS.

Task-number: QTBUG-7105
Reviewed-by: Alexis
Reviewed-by: Jason McDonald