qt:qt.git
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration
Qt Continuous Integration System [Mon, 8 Nov 2010 13:23:40 +0000 (14:23 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/doc-staging:
  Doc: Updated the configuration file to use the Qt 4.7 style sheets.
  Doc: Added more hints for building Qt for Symbian on Linux.
  Doc: reintroducing QML elements table temporarily
  Doc: adding html clasnames to the next and previous links
  qdoc: Remove leading QML: text from certain node names.
  Doc: Attempt to document content handling in Flickable.
  Doc: Removed note about some Qt classes working without an application.

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, 8 Nov 2010 02:15:01 +0000 (03:15 +0100)]
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:
  Task-number: QTBUG-15059

11 years agoTask-number: QTBUG-15059
juhvu [Mon, 8 Nov 2010 01:43:53 +0000 (11:43 +1000)]
Task-number: QTBUG-15059
Removed implicit QtGui linking from qsymbianbearer plugin as it
is not needed.

11 years agoMerge branch '4.7-upstream' into 4.7-doc
A-Team [Sat, 6 Nov 2010 23:00:11 +0000 (00:00 +0100)]
Merge branch '4.7-upstream' into 4.7-doc

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integr...
Qt Continuous Integration System [Fri, 5 Nov 2010 23:15:28 +0000 (00:15 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Hide the cursor in the tested text edit

11 years agoMerge branch '4.7-upstream' into 4.7-doc
A-Team [Fri, 5 Nov 2010 23:00:12 +0000 (00:00 +0100)]
Merge branch '4.7-upstream' into 4.7-doc

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, 5 Nov 2010 17:29:58 +0000 (18:29 +0100)]
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:
  tst_qnetworkreply: New HTTP test with AuthenticationReuseAttribute
  tst_qnetworkreply: One more HTTP test using setReadBufferSize()

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
David Boddie [Fri, 5 Nov 2010 16:03:09 +0000 (17:03 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7

11 years agoDoc: Updated the configuration file to use the Qt 4.7 style sheets.
David Boddie [Fri, 5 Nov 2010 15:36:57 +0000 (16:36 +0100)]
Doc: Updated the configuration file to use the Qt 4.7 style sheets.

11 years agotst_qnetworkreply: New HTTP test with AuthenticationReuseAttribute
Markus Goetz [Fri, 5 Nov 2010 14:03:06 +0000 (15:03 +0100)]
tst_qnetworkreply: New HTTP test with AuthenticationReuseAttribute

11 years agotst_qnetworkreply: One more HTTP test using setReadBufferSize()
Markus Goetz [Fri, 5 Nov 2010 13:11:30 +0000 (14:11 +0100)]
tst_qnetworkreply: One more HTTP test using setReadBufferSize()

Task-number: QTBUG-13431

11 years agoHide the cursor in the tested text edit
Harald Fernengel [Fri, 5 Nov 2010 12:22:20 +0000 (13:22 +0100)]
Hide the cursor in the tested text edit

Hiding the cursor will make the image comparison more robust. This fixes
the sporadic test fail we saw on some machines - every time the blinking
cursor was visible, the test failed.

Reviewed-by: Robert Griebl
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integr...
Qt Continuous Integration System [Fri, 5 Nov 2010 10:46:00 +0000 (11:46 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (56 commits)
  Give the toplevel widget a layout
  fix tests when using Qt in a namespace
  Fix tst_symbols auto test
  trivial: fix build
  Fix crash
  fix isLikelyToBeNfs usage
  Export isLikelyToBeNfs only if we have an internal build
  Fixed QGraphicsView autotest to use a dummy toplevel widget
  Fixed QMdiArea autotest to use a dummy toplevel widget.
  Fixed QMenuBar autotest. Changed window activation order.
  Fixed QStyleSheetStyle autotest to use a dummy toplevel widget
  Fixed QPathCliper autotest, to skip a test when qreal != double
  Fixed QComboBox autotest to use a dummy toplevel widget
  Fixed QColumnView autotest. Added an QApplication::processEvents
  Fixed QAccessability autotest to use a dummy toplevel widget
  Fix QListWidget test
  Fix QGraphicsItems autotest
  Fixed QGraphicsScene autotest to use a dummy toplevel widget
  Fixed QGraphicsItem autotest to use a dummy toplevel widget
  Fixed QListView autotest to use a dummy toplevel widget
  ...

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, 5 Nov 2010 05:13:42 +0000 (06:13 +0100)]
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 opening a network session multiple times in succession.
  Fix synchronous dispatch in ICD in non-main threads.
  Russian translation update
  QNAM HTTP: Download last chunk properly when readBufferSize() limited
  Prevent access to non-existent memory in QGL2PEXVertexArray
  Prevent excessive seeks in xbm detection

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration
Qt Continuous Integration System [Fri, 5 Nov 2010 01:17:29 +0000 (02:17 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/doc-staging:
  Doc: Correcting character escape bug
  Doc: Clarified the lifetime of the session bus connection.
  Doc: Added a snippet showing the default BorderImage tiling behavior.
  Doc: using pointer member variables and language change
  Doc: Added more instructions to help with device file permissions.
  Doc: Mentioned default values for the BorderImage tile modes.
  Document the difference between +0.0 and -0.0 for QPointF and QSizeF.

11 years agoFix opening a network session multiple times in succession.
Aaron McCarthy [Fri, 5 Nov 2010 01:08:31 +0000 (11:08 +1000)]
Fix opening a network session multiple times in succession.

Don't try to open the network session if there is already an in progress
open request.

11 years agoFix synchronous dispatch in ICD in non-main threads.
Aaron McCarthy [Fri, 5 Nov 2010 00:01:24 +0000 (10:01 +1000)]
Fix synchronous dispatch in ICD in non-main threads.

ICD DBus signals always come in via the main thread. During synchronous
dispatch these signals were not being emitted when expected because no
event loop is running in the destination thread. Fixed by added a call
to QCoreApplication::sendPostedEvents(object, QEvent::MetaCall) in the
synchronous dispatch loop.

Task-number: QTBUG-15004

11 years agoMerge branch '4.7-upstream' into 4.7-doc
A-Team [Thu, 4 Nov 2010 23:00:18 +0000 (00:00 +0100)]
Merge branch '4.7-upstream' into 4.7-doc

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, 4 Nov 2010 19:25:15 +0000 (20:25 +0100)]
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 code changes that were NOT intended as part of the fix
  Wordwrap QInputDialog label in Symbian
  Use qtmain.lib to provide entry point for all Symbian applications

11 years agoRussian translation update
Sergey Belyashov [Thu, 4 Nov 2010 16:21:33 +0000 (17:21 +0100)]
Russian translation update

Merge-request: 895
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoDoc: Added more hints for building Qt for Symbian on Linux.
David Boddie [Thu, 4 Nov 2010 14:52:42 +0000 (15:52 +0100)]
Doc: Added more hints for building Qt for Symbian on Linux.

Initial-review-and-suggestions-by: axis
11 years agoQNAM HTTP: Download last chunk properly when readBufferSize() limited
Markus Goetz [Thu, 4 Nov 2010 14:24:32 +0000 (15:24 +0100)]
QNAM HTTP: Download last chunk properly when readBufferSize() limited

Task-number: QTBUG-13431
Task-number: QTBUG-6276
Reviewed-by: ogoffart
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integr...
Qt Continuous Integration System [Thu, 4 Nov 2010 14:07:35 +0000 (15:07 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (56 commits)
  Give the toplevel widget a layout
  fix tests when using Qt in a namespace
  Fix tst_symbols auto test
  trivial: fix build
  Fix crash
  fix isLikelyToBeNfs usage
  Export isLikelyToBeNfs only if we have an internal build
  Fixed QGraphicsView autotest to use a dummy toplevel widget
  Fixed QMdiArea autotest to use a dummy toplevel widget.
  Fixed QMenuBar autotest. Changed window activation order.
  Fixed QStyleSheetStyle autotest to use a dummy toplevel widget
  Fixed QPathCliper autotest, to skip a test when qreal != double
  Fixed QComboBox autotest to use a dummy toplevel widget
  Fixed QColumnView autotest. Added an QApplication::processEvents
  Fixed QAccessability autotest to use a dummy toplevel widget
  Fix QListWidget test
  Fix QGraphicsItems autotest
  Fixed QGraphicsScene autotest to use a dummy toplevel widget
  Fixed QGraphicsItem autotest to use a dummy toplevel widget
  Fixed QListView autotest to use a dummy toplevel widget
  ...

11 years agoMerge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Morten Engvoldsen [Thu, 4 Nov 2010 13:50:30 +0000 (14:50 +0100)]
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7

11 years agoDoc: reintroducing QML elements table temporarily
Morten Engvoldsen [Thu, 4 Nov 2010 13:49:44 +0000 (14:49 +0100)]
Doc: reintroducing QML elements table temporarily

11 years agoRemove code changes that were NOT intended as part of the fix
Sami Merila [Thu, 4 Nov 2010 13:27:39 +0000 (15:27 +0200)]
Remove code changes that were NOT intended as part of the fix

For some unknown reasons (read: missed git checkout -f), few code line
changes which were NOT part of fix for QTBUG-14331 crept into the
commit. These are now removed with this fix.

Task-number: QTBUG-14331
Reviewed-by: Janne Anttila
11 years agoPrevent access to non-existent memory in QGL2PEXVertexArray
Topi Reiniƶ [Thu, 4 Nov 2010 13:20:02 +0000 (14:20 +0100)]
Prevent access to non-existent memory in QGL2PEXVertexArray

QGL2PEXVertexArray::addClosingLine() uses using QDataBuffer::add() to
add a QPointF at the end, with a const reference to another value in
the same array. As add() resizes and possibly relocates the buffer, an
already-released memory location may be accessed.

This change copies the value into a temporary variable before resizing
the array.

Task-number: QTBUG-14944
Reviewed-by: Samuel
11 years agoDoc: adding html clasnames to the next and previous links
Morten Engvoldsen [Thu, 4 Nov 2010 13:17:03 +0000 (14:17 +0100)]
Doc: adding html clasnames to the next and previous links

Reviewed-by: David Boddie
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Janne Koskinen [Thu, 4 Nov 2010 13:10:03 +0000 (15:10 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7

11 years agoWordwrap QInputDialog label in Symbian
Janne Koskinen [Thu, 4 Nov 2010 12:47:20 +0000 (14:47 +0200)]
Wordwrap QInputDialog label in Symbian

Enable wordwrapping for QInputDialog in Symbian to allow longer texts to
be displayed without cutting them off. Fixes issue with javascript
prompt not showing long texts.

Task-number: QT-4008
Reviewed-by: Sami Merila
11 years agoqdoc: Remove leading QML: text from certain node names.
David Boddie [Thu, 4 Nov 2010 12:59:42 +0000 (13:59 +0100)]
qdoc: Remove leading QML: text from certain node names.

Reviewed-by: Martin Smith
11 years agoPrevent excessive seeks in xbm detection
Harald Fernengel [Thu, 4 Nov 2010 12:49:43 +0000 (13:49 +0100)]
Prevent excessive seeks in xbm detection

When auto-detecting an image type, the xbm handler would read
the entire file just to figure out that it's not an xbm. This patch
limits the read to maximum 4k and also breaks if line length >= 299.

Task-number: QT-4021
Reviewed-by: Robert Griebl
11 years agoDoc: Attempt to document content handling in Flickable.
David Boddie [Thu, 4 Nov 2010 12:42:37 +0000 (13:42 +0100)]
Doc: Attempt to document content handling in Flickable.

Reviewed-by: Alan Alpert
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
David Boddie [Thu, 4 Nov 2010 12:33:02 +0000 (13:33 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7

11 years agoDoc: Removed note about some Qt classes working without an application.
David Boddie [Thu, 4 Nov 2010 12:28:42 +0000 (13:28 +0100)]
Doc: Removed note about some Qt classes working without an application.

The QString example turned out to be a poor one because it requires
an application instance in cases where text codecs need to be set up
for the user's locale.

11 years agoUse qtmain.lib to provide entry point for all Symbian applications
Miikka Heikkinen [Thu, 4 Nov 2010 10:23:54 +0000 (12:23 +0200)]
Use qtmain.lib to provide entry point for all Symbian applications

Using Open C's libcrt0.lib to provide entry point caused problems
for applications that launched other processes, as Open C retains a
handle to all launched processes even after said processes terminate.

Task-number: QTBUG-14735
Reviewed-by: axis
11 years agoGive the toplevel widget a layout
Harald Fernengel [Thu, 4 Nov 2010 09:39:16 +0000 (10:39 +0100)]
Give the toplevel widget a layout

This ensures that the top-level will be large enough to view the text
edit.

11 years agoMerge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Morten Engvoldsen [Thu, 4 Nov 2010 09:33:23 +0000 (10:33 +0100)]
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7

11 years agoDoc: Correcting character escape bug
Morten Engvoldsen [Thu, 4 Nov 2010 09:32:26 +0000 (10:32 +0100)]
Doc: Correcting character escape bug

11 years agofix tests when using Qt in a namespace
Harald Fernengel [Thu, 4 Nov 2010 09:31:22 +0000 (10:31 +0100)]
fix tests when using Qt in a namespace

11 years agoFix tst_symbols auto test
Harald Fernengel [Thu, 4 Nov 2010 09:20:27 +0000 (10:20 +0100)]
Fix tst_symbols auto test

Prefix isLikelyToBeNfs with a "q", even though it's only
autotest-exported.

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, 4 Nov 2010 07:59:05 +0000 (08:59 +0100)]
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 bearermonitor when building for Maemo in scratchbox.

11 years agoFix bearermonitor when building for Maemo in scratchbox.
Aaron McCarthy [Thu, 4 Nov 2010 03:45:46 +0000 (13:45 +1000)]
Fix bearermonitor when building for Maemo in scratchbox.

Use the correct ui file when building in scratchbox.
Remove use of message boxes.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integr...
Qt Continuous Integration System [Thu, 4 Nov 2010 02:45:25 +0000 (03:45 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (53 commits)
  trivial: fix build
  Fix crash
  fix isLikelyToBeNfs usage
  Export isLikelyToBeNfs only if we have an internal build
  Fixed QGraphicsView autotest to use a dummy toplevel widget
  Fixed QMdiArea autotest to use a dummy toplevel widget.
  Fixed QMenuBar autotest. Changed window activation order.
  Fixed QStyleSheetStyle autotest to use a dummy toplevel widget
  Fixed QPathCliper autotest, to skip a test when qreal != double
  Fixed QComboBox autotest to use a dummy toplevel widget
  Fixed QColumnView autotest. Added an QApplication::processEvents
  Fixed QAccessability autotest to use a dummy toplevel widget
  Fix QListWidget test
  Fix QGraphicsItems autotest
  Fixed QGraphicsScene autotest to use a dummy toplevel widget
  Fixed QGraphicsItem autotest to use a dummy toplevel widget
  Fixed QListView autotest to use a dummy toplevel widget
  Fixed QMenu autotest to use a dummy toplevel widget
  Fixed QMenuBar autotest. Added mainwindow activation
  Fixed QString autotest when QT_QLOCALE_USES_FCVT is set
  ...

11 years agoMerge branch '4.7-upstream' into 4.7-doc
A-Team [Wed, 3 Nov 2010 23:00:12 +0000 (00:00 +0100)]
Merge branch '4.7-upstream' into 4.7-doc

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Wed, 3 Nov 2010 20:58:24 +0000 (21:58 +0100)]
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:
  The lastCenterPoint should be equal to centerPoint for new gestures.
  PinchGesture: lastRotationAngle should start at 0.
  tst_qnetworkreply: Add testcase for unknown authentication method
  QNAM: Reset authenticator state properly between requests
  msvc: enable unreferenced code elimination in release with debuginfo builds
  exclude headers in builddir from -copy option
  more elegant treatment of qconfig.h special case
  simplify recursive symlinking

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
David Boddie [Wed, 3 Nov 2010 18:24:36 +0000 (19:24 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7

11 years agoDoc: Clarified the lifetime of the session bus connection.
David Boddie [Wed, 3 Nov 2010 18:17:47 +0000 (19:17 +0100)]
Doc: Clarified the lifetime of the session bus connection.

Reviewed-by: Thiago Macieira
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration
Qt Continuous Integration System [Wed, 3 Nov 2010 17:11:17 +0000 (18:11 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/doc-staging:
  qdoc: Added next and previous links to top of pages.
  Doc: style tuning
  Doc: fixing style - tool buttons to bold.
  Doc: updating the template to support search feature better.
  Doc: Fixing columns to display all elements in lists - css3
  Doc: fixing bugs in style
  Doc: fixing style for search display and slim fit menus
  Doc: Fixing bug in sorting script for search results.
  Doc: Fixed basic language.
  Doc: Added Windows Vista to the trademark list.
  Doc: Updated the Java trademark information.
  Doc: Moved QFileSystemModel example code to the class documentation.
  Doc: Corrected the name property as it was incorrectly declared.

11 years agoThe lastCenterPoint should be equal to centerPoint for new gestures.
Frederik Gladhorn [Mon, 25 Oct 2010 21:28:37 +0000 (23:28 +0200)]
The lastCenterPoint should be equal to centerPoint for new gestures.

Reviewed-by: Zeno Albisser
11 years agoPinchGesture: lastRotationAngle should start at 0.
Frederik Gladhorn [Mon, 25 Oct 2010 20:28:31 +0000 (22:28 +0200)]
PinchGesture: lastRotationAngle should start at 0.

Reviewed-by: Zeno Albisser
11 years agoDoc: Added a snippet showing the default BorderImage tiling behavior.
David Boddie [Wed, 3 Nov 2010 16:50:09 +0000 (17:50 +0100)]
Doc: Added a snippet showing the default BorderImage tiling behavior.

11 years agotst_qnetworkreply: Add testcase for unknown authentication method
Markus Goetz [Wed, 3 Nov 2010 16:17:47 +0000 (17:17 +0100)]
tst_qnetworkreply: Add testcase for unknown authentication method

Task-number: QTBUG-4121
Reviewed-by: ogoffart
11 years agoDoc: using pointer member variables and language change
Leena Miettinen [Wed, 3 Nov 2010 16:22:40 +0000 (17:22 +0100)]
Doc: using pointer member variables and language change

Reviewed-by: Friedemann Kleint
Reviewed-by: Martin Smith
11 years agoDoc: Added more instructions to help with device file permissions.
David Boddie [Wed, 3 Nov 2010 16:08:28 +0000 (17:08 +0100)]
Doc: Added more instructions to help with device file permissions.

11 years agoDoc: Mentioned default values for the BorderImage tile modes.
David Boddie [Wed, 3 Nov 2010 15:57:08 +0000 (16:57 +0100)]
Doc: Mentioned default values for the BorderImage tile modes.

11 years agoQNAM: Reset authenticator state properly between requests
Markus Goetz [Wed, 3 Nov 2010 15:46:24 +0000 (16:46 +0100)]
QNAM: Reset authenticator state properly between requests

Reset authenticator and fix operator=(...) of QAuthenticator.

Task-number: QTBUG-6792
Reviewed-by: ogoffart
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
David Boddie [Wed, 3 Nov 2010 15:45:56 +0000 (16:45 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7

11 years agoDocument the difference between +0.0 and -0.0 for QPointF and QSizeF.
David Boddie [Wed, 3 Nov 2010 15:39:25 +0000 (16:39 +0100)]
Document the difference between +0.0 and -0.0 for QPointF and QSizeF.

Reviewed-by: Robert Griebl
11 years agomsvc: enable unreferenced code elimination in release with debuginfo builds
Oswald Buddenhagen [Wed, 3 Nov 2010 10:47:17 +0000 (11:47 +0100)]
msvc: enable unreferenced code elimination in release with debuginfo builds

that linker optimization is on by default in release builds, so override
/DEBUG implicitly turning it off. as it happens, this implicitly
disables incremental linking, so that option can go away now.

Reviewed-by: joerg
Task-number: QTBUG-14007

11 years agoexclude headers in builddir from -copy option
Oswald Buddenhagen [Wed, 3 Nov 2010 09:06:23 +0000 (10:06 +0100)]
exclude headers in builddir from -copy option

Reviewed-by: joerg
11 years agomore elegant treatment of qconfig.h special case
Oswald Buddenhagen [Tue, 2 Nov 2010 18:59:21 +0000 (19:59 +0100)]
more elegant treatment of qconfig.h special case

instead of injecting it only if it is not there yet, exclude it if it is
already there and then unconditionally inject it. this makes things more
deterministic.

Reviewed-by: joerg
11 years agotrivial: fix build
Harald Fernengel [Wed, 3 Nov 2010 11:50:32 +0000 (12:50 +0100)]
trivial: fix build

11 years agoqdoc: Added next and previous links to top of pages.
Martin Smith [Wed, 3 Nov 2010 11:27:32 +0000 (12:27 +0100)]
qdoc: Added next and previous links to top of pages.

Task-number: QTBUG-14979

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, 3 Nov 2010 11:06:47 +0000 (12:06 +0100)]
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:
  Qt/Symbian: QInputDialog layout and size are wrong

11 years agoDoc: style tuning
Morten Engvoldsen [Wed, 3 Nov 2010 10:24:41 +0000 (11:24 +0100)]
Doc: style tuning

11 years agoDoc: fixing style - tool buttons to bold.
Morten Engvoldsen [Wed, 3 Nov 2010 10:16:33 +0000 (11:16 +0100)]
Doc: fixing style - tool buttons to bold.

11 years agoDoc: updating the template to support search feature better.
Morten Engvoldsen [Wed, 3 Nov 2010 09:33:20 +0000 (10:33 +0100)]
Doc: updating the template to support search feature better.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integr...
Qt Continuous Integration System [Wed, 3 Nov 2010 09:30:35 +0000 (10:30 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (52 commits)
  Fix crash
  fix isLikelyToBeNfs usage
  Export isLikelyToBeNfs only if we have an internal build
  Fixed QGraphicsView autotest to use a dummy toplevel widget
  Fixed QMdiArea autotest to use a dummy toplevel widget.
  Fixed QMenuBar autotest. Changed window activation order.
  Fixed QStyleSheetStyle autotest to use a dummy toplevel widget
  Fixed QPathCliper autotest, to skip a test when qreal != double
  Fixed QComboBox autotest to use a dummy toplevel widget
  Fixed QColumnView autotest. Added an QApplication::processEvents
  Fixed QAccessability autotest to use a dummy toplevel widget
  Fix QListWidget test
  Fix QGraphicsItems autotest
  Fixed QGraphicsScene autotest to use a dummy toplevel widget
  Fixed QGraphicsItem autotest to use a dummy toplevel widget
  Fixed QListView autotest to use a dummy toplevel widget
  Fixed QMenu autotest to use a dummy toplevel widget
  Fixed QMenuBar autotest. Added mainwindow activation
  Fixed QString autotest when QT_QLOCALE_USES_FCVT is set
  Fixed QButtonGroup autotest to run on Maemo
  ...

11 years agoDoc: Fixing columns to display all elements in lists - css3
Morten Engvoldsen [Wed, 3 Nov 2010 09:17:55 +0000 (10:17 +0100)]
Doc: Fixing columns to display all elements in lists - css3

11 years agoQt/Symbian: QInputDialog layout and size are wrong
Sami Merila [Wed, 3 Nov 2010 07:40:16 +0000 (09:40 +0200)]
Qt/Symbian: QInputDialog layout and size are wrong

The QInputDialog with anything but QLineEdit as the input widget,
will show up as minimal size on device/emulator. Also, the dialog
looks bad since the widgets are deployed very close to the dialog
borders.

As a fix, layout will not get the size policy set on Symbian, but
the dialog itself is stretched to occupy screen width and thus, layout
grows to occupy the available size. Additionally, style will set layout
pixel metrics for dialogs larger than for other widgets, to avoid
the layout from putting widgets very close to dialog border.

Task-number: QTBUG-14331
Reviewed-by: Janne Anttila
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Wed, 3 Nov 2010 02:47:22 +0000 (03:47 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  make the dtd reflect reality
  Fixed destination path for the S60 feedback plugin.
  german translation: minor additions + fixes
  fix qdoc doc generation

11 years agosimplify recursive symlinking
Oswald Buddenhagen [Tue, 2 Nov 2010 17:53:17 +0000 (18:53 +0100)]
simplify recursive symlinking

the jira issue itself has been already fixed, but in a somewhat arcane
way. this one is better maintainable.

Reviewed-by: joerg
Task-number: QTBUG-14955

11 years agoFix crash
Harald Fernengel [Tue, 2 Nov 2010 15:53:38 +0000 (16:53 +0100)]
Fix crash

check the global network proxy for 0 before dereferencing

Reviewed-by: Robert Griebl
11 years agomake the dtd reflect reality
Oswald Buddenhagen [Tue, 2 Nov 2010 15:09:18 +0000 (16:09 +0100)]
make the dtd reflect reality

11 years agofix isLikelyToBeNfs usage
Harald Fernengel [Tue, 2 Nov 2010 14:58:09 +0000 (15:58 +0100)]
fix isLikelyToBeNfs usage

11 years agoExport isLikelyToBeNfs only if we have an internal build
Harald Fernengel [Tue, 2 Nov 2010 14:56:10 +0000 (15:56 +0100)]
Export isLikelyToBeNfs only if we have an internal build

11 years agoFixed destination path for the S60 feedback plugin.
David Boddie [Tue, 2 Nov 2010 14:33:41 +0000 (15:33 +0100)]
Fixed destination path for the S60 feedback plugin.

Reviewed-by: axis
11 years agoFixed QGraphicsView autotest to use a dummy toplevel widget
Dominik Holland [Fri, 6 Aug 2010 12:49:09 +0000 (14:49 +0200)]
Fixed QGraphicsView autotest to use a dummy toplevel widget

Fixed some conversion problems using qreal

11 years agoFixed QMdiArea autotest to use a dummy toplevel widget.
Dominik Holland [Fri, 6 Aug 2010 07:54:58 +0000 (09:54 +0200)]
Fixed QMdiArea autotest to use a dummy toplevel widget.

11 years agoFixed QMenuBar autotest. Changed window activation order.
Dominik Holland [Thu, 5 Aug 2010 12:58:39 +0000 (14:58 +0200)]
Fixed QMenuBar autotest. Changed window activation order.

11 years agoFixed QStyleSheetStyle autotest to use a dummy toplevel widget
Dominik Holland [Thu, 5 Aug 2010 11:43:13 +0000 (13:43 +0200)]
Fixed QStyleSheetStyle autotest to use a dummy toplevel widget

-use platform quirks to skip tests

11 years agoFixed QPathCliper autotest, to skip a test when qreal != double
Dominik Holland [Thu, 5 Aug 2010 11:40:08 +0000 (13:40 +0200)]
Fixed QPathCliper autotest, to skip a test when qreal != double

11 years agoFixed QComboBox autotest to use a dummy toplevel widget
Dominik Holland [Thu, 5 Aug 2010 11:25:35 +0000 (13:25 +0200)]
Fixed QComboBox autotest to use a dummy toplevel widget

11 years agoFixed QColumnView autotest. Added an QApplication::processEvents
Dominik Holland [Thu, 5 Aug 2010 11:20:38 +0000 (13:20 +0200)]
Fixed QColumnView autotest. Added an QApplication::processEvents

11 years agoFixed QAccessability autotest to use a dummy toplevel widget
Dominik Holland [Thu, 5 Aug 2010 11:16:44 +0000 (13:16 +0200)]
Fixed QAccessability autotest to use a dummy toplevel widget

11 years agoFix QListWidget test
Ralf Engels [Thu, 5 Aug 2010 12:07:55 +0000 (14:07 +0200)]
Fix QListWidget test

11 years agoFix QGraphicsItems autotest
Ralf Engels [Tue, 3 Aug 2010 12:31:11 +0000 (14:31 +0200)]
Fix QGraphicsItems autotest

11 years agoFixed QGraphicsScene autotest to use a dummy toplevel widget
Dominik Holland [Fri, 30 Jul 2010 08:37:40 +0000 (10:37 +0200)]
Fixed QGraphicsScene autotest to use a dummy toplevel widget

11 years agoFixed QGraphicsItem autotest to use a dummy toplevel widget
Dominik Holland [Fri, 30 Jul 2010 07:25:12 +0000 (09:25 +0200)]
Fixed QGraphicsItem autotest to use a dummy toplevel widget

11 years agoFixed QListView autotest to use a dummy toplevel widget
Dominik Holland [Wed, 28 Jul 2010 11:24:15 +0000 (13:24 +0200)]
Fixed QListView autotest to use a dummy toplevel widget

11 years agoFixed QMenu autotest to use a dummy toplevel widget
Dominik Holland [Wed, 28 Jul 2010 11:18:50 +0000 (13:18 +0200)]
Fixed QMenu autotest to use a dummy toplevel widget

Added some waits

11 years agoFixed QMenuBar autotest. Added mainwindow activation
Dominik Holland [Wed, 28 Jul 2010 08:24:18 +0000 (10:24 +0200)]
Fixed QMenuBar autotest. Added mainwindow activation

11 years agoFixed QString autotest when QT_QLOCALE_USES_FCVT is set
Dominik Holland [Tue, 27 Jul 2010 12:20:53 +0000 (14:20 +0200)]
Fixed QString autotest when QT_QLOCALE_USES_FCVT is set

+/-nan tests fail when QT_QLOCALE_USES_FCVT is set
Because the behavior of qstrtod and strtod of glibc differs

11 years agoFixed QButtonGroup autotest to run on Maemo
Dominik Holland [Tue, 27 Jul 2010 11:47:10 +0000 (13:47 +0200)]
Fixed QButtonGroup autotest to run on Maemo

11 years agoFixed QGraphicsWidget autotest to use PlatformQuirks.
Dominik Holland [Tue, 27 Jul 2010 09:32:28 +0000 (11:32 +0200)]
Fixed QGraphicsWidget autotest to use PlatformQuirks.

11 years agoFixed QListWidget autotest to use a dummy toplevel widget
Dominik Holland [Tue, 27 Jul 2010 08:52:56 +0000 (10:52 +0200)]
Fixed QListWidget autotest to use a dummy toplevel widget

11 years agoFixed QTreeView autotest to use a dummy toplevel widget
Dominik Holland [Tue, 27 Jul 2010 07:43:10 +0000 (09:43 +0200)]
Fixed QTreeView autotest to use a dummy toplevel widget

11 years agoFixed QTreeWidget autotest. Added qWaitForWindowShown()
Dominik Holland [Tue, 27 Jul 2010 07:33:13 +0000 (09:33 +0200)]
Fixed QTreeWidget autotest. Added qWaitForWindowShown()

11 years agoFixed QGraphicsEffect autotest to use platform quirks
Dominik Holland [Mon, 26 Jul 2010 14:15:47 +0000 (16:15 +0200)]
Fixed QGraphicsEffect autotest to use platform quirks