qt:kenya888s-qt-palm-pre.git
8 years agoMerge remote branch 'origin/master' into qtruntime
Roberto Raggi [Mon, 22 Feb 2010 11:26:08 +0000 (12:26 +0100)]
Merge remote branch 'origin/master' into qtruntime

Conflicts:
src/declarative/qml/qml.pri
src/declarative/qml/qmlengine.cpp
src/declarative/util/qmlview.h

8 years agoIntroduced QmlEngine::importExtension.
Roberto Raggi [Mon, 22 Feb 2010 11:21:06 +0000 (12:21 +0100)]
Introduced QmlEngine::importExtension.

importExtension can be used to import QmlExtensionInterface(s) into a QmlEngine.

8 years agoDoc fix
Alan Alpert [Mon, 22 Feb 2010 09:20:46 +0000 (19:20 +1000)]
Doc fix

8 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Martin Jones [Mon, 22 Feb 2010 09:00:29 +0000 (19:00 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml

8 years agoRemove race condition in remote pixmap cancelling.
Martin Jones [Mon, 22 Feb 2010 08:55:21 +0000 (18:55 +1000)]
Remove race condition in remote pixmap cancelling.

8 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration
Qt Continuous Integration System [Mon, 22 Feb 2010 08:24:05 +0000 (09:24 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml:
  Replace QmlList* and QList* support with a single QmlListProperty type
  Rename MouseRegion -> MouseArea
  Update QmlChanges with animation API changes.
  Document the default velocity of EaseFollow
  Remove use of unexprted private classes.
  Fix compile error on Solaris
  Increase durations when testing Behaviors.
  Add cached path rounded rect painting benchmark.
  Remove use of direct event posting.  Use QTest::keyClick() for keys.

8 years agoReplace QmlList* and QList* support with a single QmlListProperty type
Aaron Kennedy [Mon, 22 Feb 2010 04:56:49 +0000 (14:56 +1000)]
Replace QmlList* and QList* support with a single QmlListProperty type

As a value type QmlListProperty doesn't consume any memory in the object.
It also has a companion QmlListReference class that is part of the public
API for C++ developers to interact with that also manages memory issues
that existed with previous solutions (if the containing QObject was
destroyed it left a dangling pointer).

8 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into master...
Qt Continuous Integration System [Mon, 22 Feb 2010 05:13:14 +0000 (06:13 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Documentation fixes.
  Add a qRegisterQmlElements function to QtMultimedia

8 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Martin Jones [Mon, 22 Feb 2010 05:11:11 +0000 (15:11 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml

8 years agoRename MouseRegion -> MouseArea
Martin Jones [Mon, 22 Feb 2010 05:10:37 +0000 (15:10 +1000)]
Rename MouseRegion -> MouseArea

8 years agoDocumentation fixes.
Justin McPherson [Mon, 22 Feb 2010 05:04:43 +0000 (15:04 +1000)]
Documentation fixes.

Reviewed-by: Nicholas Young
8 years agoAdd a qRegisterQmlElements function to QtMultimedia
Justin McPherson [Mon, 22 Feb 2010 04:38:04 +0000 (14:38 +1000)]
Add a qRegisterQmlElements function to QtMultimedia

Avoid exposing private classes.

Reviewed-by: Bill King
8 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Michael Brasser [Mon, 22 Feb 2010 04:36:28 +0000 (14:36 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml

8 years agoUpdate QmlChanges with animation API changes.
Michael Brasser [Mon, 22 Feb 2010 04:35:57 +0000 (14:35 +1000)]
Update QmlChanges with animation API changes.

8 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Martin Jones [Mon, 22 Feb 2010 04:13:02 +0000 (14:13 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml

8 years agoDocument the default velocity of EaseFollow
Martin Jones [Mon, 22 Feb 2010 04:12:24 +0000 (14:12 +1000)]
Document the default velocity of EaseFollow

Task-number: QTBUG-8181

8 years agoRemove use of unexprted private classes.
Martin Jones [Mon, 22 Feb 2010 04:06:30 +0000 (14:06 +1000)]
Remove use of unexprted private classes.

8 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Aaron Kennedy [Mon, 22 Feb 2010 01:41:23 +0000 (11:41 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml

8 years agoFix compile error on Solaris
Aaron Kennedy [Mon, 22 Feb 2010 01:39:22 +0000 (11:39 +1000)]
Fix compile error on Solaris

QTBUG-8267.  Remove templating from QmlTimeLineEvent class (and rename
it to QmlTimeLineCallback to more represent what it is).

8 years agoIncrease durations when testing Behaviors.
Michael Brasser [Mon, 22 Feb 2010 01:24:48 +0000 (11:24 +1000)]
Increase durations when testing Behaviors.

This should make the tests at least somewhat more reliable.

8 years agoAdd cached path rounded rect painting benchmark.
Martin Jones [Mon, 22 Feb 2010 01:23:39 +0000 (11:23 +1000)]
Add cached path rounded rect painting benchmark.

8 years agoRemove use of direct event posting. Use QTest::keyClick() for keys.
Martin Jones [Mon, 22 Feb 2010 01:18:24 +0000 (11:18 +1000)]
Remove use of direct event posting.  Use QTest::keyClick() for keys.

8 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integ...
Qt Continuous Integration System [Mon, 22 Feb 2010 01:12:24 +0000 (02:12 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
  QtMultimedia: Fix compilation of qml/qsoundeffect_pulse on 64 bit.

8 years agoMerge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Sun, 21 Feb 2010 18:43:38 +0000 (19:43 +0100)]
Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
  Revert "Factored readRegistryKey implementation out of qmake"
  Revert "Factored epocRoot implementation out of qmake"

8 years agoRevert "Factored readRegistryKey implementation out of qmake"
Thiago Macieira [Sun, 21 Feb 2010 18:14:20 +0000 (19:14 +0100)]
Revert "Factored readRegistryKey implementation out of qmake"

This reverts commit f641369ceb7b7e2f95b9d0656b34c0517c5b95f7.

Conflicts:

qmake/Makefile.unix

8 years agoRevert "Factored epocRoot implementation out of qmake"
Thiago Macieira [Sun, 21 Feb 2010 18:13:03 +0000 (19:13 +0100)]
Revert "Factored epocRoot implementation out of qmake"

This reverts commit 13cb80be958c40077245cbc4b36448a661e30c64.

Conflicts:

qmake/Makefile.unix
qmake/generators/symbian/symmake.cpp

8 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integ...
Qt Continuous Integration System [Sun, 21 Feb 2010 14:39:13 +0000 (15:39 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
  QtMultimedia: Fix compilation of qml/qsoundeffect_pulse on 64 bit.

8 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Sun, 21 Feb 2010 08:34:21 +0000 (09:34 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Compile fix for symbian
  license doc updated for libtiff 3.9.2
  Our configuration and build modifications to libtiff
  Add libtiff 3.9.2
  Update license doc, .pro file and qjpeghandler for libjpeg 8
  Our configuration and build modifications to libjpeg
  Add libjpeg 8
  Delete libjpeg 6b
  Delete libtiff 3.8.2

8 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integ...
Qt Continuous Integration System [Sun, 21 Feb 2010 05:34:12 +0000 (06:34 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
  QtMultimedia: Fix compilation of qml/qsoundeffect_pulse on 64 bit.

8 years agoQtMultimedia: Fix compilation of qml/qsoundeffect_pulse on 64 bit.
Daniel Molkentin [Sun, 21 Feb 2010 00:51:02 +0000 (01:51 +0100)]
QtMultimedia: Fix compilation of qml/qsoundeffect_pulse on 64 bit.

8 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Sat, 20 Feb 2010 23:54:46 +0000 (00:54 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Compile fix for symbian
  license doc updated for libtiff 3.9.2
  Our configuration and build modifications to libtiff
  Add libtiff 3.9.2
  Update license doc, .pro file and qjpeghandler for libjpeg 8
  Our configuration and build modifications to libjpeg
  Add libjpeg 8
  Delete libjpeg 6b
  Delete libtiff 3.8.2

8 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
aavit [Sat, 20 Feb 2010 21:02:27 +0000 (22:02 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2

8 years agoCompile fix for symbian
aavit [Sat, 20 Feb 2010 21:01:15 +0000 (22:01 +0100)]
Compile fix for symbian

Reviewed-by: trust me
8 years agoMerge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Sat, 20 Feb 2010 18:08:59 +0000 (19:08 +0100)]
Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (324 commits)
  Assistant: Remove 'namespace qt' from new files in 4.7
  Doc: these files are NOT part of the test suite of the Qt toolkit
  Autotest: make the licenseCheck test also check .qdoc files
  use egl properties when creating surfaces on symbian
  work around the current include file structure on Symbian^3
  Get rid of the dependency on the Symbian app layer
  Fix incorrect license headers
  Fix incorrect license headers
  tst_qnetworkreply: Check if TCP/HTTP connection got re-used
  Fix bad conflict resolution from 4baa9dfb5273d7b501dcb3f456983262c53cc8d1
  Fix building in a namespace on Windows
  Supressed Icon sizes on QPushButton in QS60Style
  Ensure that posted events are sent on Windows
  Fixed off-by-one blending errors in the NEON drawhelper code.
  Fixed libstdcpp.dll version autodetection for Symbian
  Fixed linkage failure when building qmake on Unix platforms
  Factored epocRoot implementation out of qmake
  Factored readRegistryKey implementation out of qmake
  Cetest extensions for Windows Mobile device power operations.
  Remote lib extensions for Windows Mobile device power operations.
  ...

8 years agoAssistant: Remove 'namespace qt' from new files in 4.7
Thiago Macieira [Sat, 20 Feb 2010 16:32:16 +0000 (17:32 +0100)]
Assistant: Remove 'namespace qt' from new files in 4.7

8 years agoMerge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Sat, 20 Feb 2010 13:41:40 +0000 (14:41 +0100)]
Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (323 commits)
  Doc: these files are NOT part of the test suite of the Qt toolkit
  Autotest: make the licenseCheck test also check .qdoc files
  use egl properties when creating surfaces on symbian
  work around the current include file structure on Symbian^3
  Get rid of the dependency on the Symbian app layer
  Fix incorrect license headers
  Fix incorrect license headers
  tst_qnetworkreply: Check if TCP/HTTP connection got re-used
  Fix bad conflict resolution from 4baa9dfb5273d7b501dcb3f456983262c53cc8d1
  Fix building in a namespace on Windows
  Supressed Icon sizes on QPushButton in QS60Style
  Ensure that posted events are sent on Windows
  Fixed off-by-one blending errors in the NEON drawhelper code.
  Fixed libstdcpp.dll version autodetection for Symbian
  Fixed linkage failure when building qmake on Unix platforms
  Factored epocRoot implementation out of qmake
  Factored readRegistryKey implementation out of qmake
  Cetest extensions for Windows Mobile device power operations.
  Remote lib extensions for Windows Mobile device power operations.
  ColorDialog is always shown as stripped-down version (for QVGA)
  ...

8 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Sat, 20 Feb 2010 13:20:44 +0000 (14:20 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  license doc updated for libtiff 3.9.2
  Our configuration and build modifications to libtiff
  Add libtiff 3.9.2
  Update license doc, .pro file and qjpeghandler for libjpeg 8
  Our configuration and build modifications to libjpeg
  Add libjpeg 8
  Delete libjpeg 6b
  Delete libtiff 3.8.2

8 years agoMerge branch 'rtiff392'
aavit [Sat, 20 Feb 2010 12:55:41 +0000 (13:55 +0100)]
Merge branch 'rtiff392'

Conflicts:
doc/src/legal/3rdparty.qdoc

8 years agoMerge branch 'rjpeg8'
aavit [Sat, 20 Feb 2010 12:48:13 +0000 (13:48 +0100)]
Merge branch 'rjpeg8'

8 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration
Qt Continuous Integration System [Sat, 20 Feb 2010 09:27:24 +0000 (10:27 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Added exception to destdir location for abld and sbsv2.
  Moved the "sis" target and friends from cpp code to qmake profiles.

8 years agoDoc: these files are NOT part of the test suite of the Qt toolkit
Thiago Macieira [Sat, 20 Feb 2010 08:26:58 +0000 (09:26 +0100)]
Doc: these files are NOT part of the test suite of the Qt toolkit

8 years agoAutotest: make the licenseCheck test also check .qdoc files
Thiago Macieira [Sat, 20 Feb 2010 08:24:00 +0000 (09:24 +0100)]
Autotest: make the licenseCheck test also check .qdoc files

8 years agoMerge remote branch 'origin/master' into qt-master-from-4.6
Thiago Macieira [Sat, 20 Feb 2010 08:04:29 +0000 (09:04 +0100)]
Merge remote branch 'origin/master' into qt-master-from-4.6

Conflicts:
configure.exe
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qgl.cpp

8 years agoMerge remote branch 'origin/4.6' into qt-master-from-4.6
Thiago Macieira [Sat, 20 Feb 2010 07:54:57 +0000 (08:54 +0100)]
Merge remote branch 'origin/4.6' into qt-master-from-4.6

Conflicts:
qmake/Makefile.unix
qmake/generators/symbian/symmake.cpp

8 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration
Qt Continuous Integration System [Sat, 20 Feb 2010 02:36:04 +0000 (03:36 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Added exception to destdir location for abld and sbsv2.
  Moved the "sis" target and friends from cpp code to qmake profiles.

8 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integ...
Qt Continuous Integration System [Fri, 19 Feb 2010 23:07:13 +0000 (00:07 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (25 commits)
  Add convenience function QTextCursor::positionInBlock()
  Fixed URL in Russian translation.
  Designer/Resourceview: Suppress warning about QFileInfo on empty path.
  optimize qstring::simplified()
  Revert optimizations to QString::append
  unbreak QList::append() and co. again
  Implement bookmark manager widget.
  optimization: use QList::reserve() and QVector::reserve()
  amend "purge msvc.net and msvc2002 makespecs"
  Added QPlainTextEditor::anchorAt(const QPoint &pos)
  Fix memmory leak.
  Fix spacing.
  Prevent renaming the bookmarks menu root item, it's just a placeholder.
  Fix broken set last shown pagen when the last page was about:blank.
  Move launch with external app in base class.
  Make sure the bookmarks menu updates on add/ remove as well.
  Fix broken Drag&Drop, reset and clear the model if we set new bookmarks.
  avoid double reallocations in appending operations
  avoid double reallocation in string-growing replace() case
  optimize qHash() some more
  ...

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Fri, 19 Feb 2010 22:48:25 +0000 (23:48 +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:
  Fixed off-by-one blending errors in the NEON drawhelper code.
  Cetest extensions for Windows Mobile device power operations.
  Remote lib extensions for Windows Mobile device power operations.

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Fri, 19 Feb 2010 20:08:08 +0000 (21:08 +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: (22 commits)
  use egl properties when creating surfaces on symbian
  work around the current include file structure on Symbian^3
  Get rid of the dependency on the Symbian app layer
  Fix incorrect license headers
  Fix incorrect license headers
  Supressed Icon sizes on QPushButton in QS60Style
  Fixed libstdcpp.dll version autodetection for Symbian
  Fixed linkage failure when building qmake on Unix platforms
  Factored epocRoot implementation out of qmake
  Factored readRegistryKey implementation out of qmake
  ColorDialog is always shown as stripped-down version (for QVGA)
  Virtual keyboard can't be closed anymore after tapping the text area
  Revert "Factored readRegistryKey implementation out of qmake"
  Revert "Factored epocRoot implementation out of qmake"
  Pass QAudioDeviceInfo when creating audio input/output in examples
  Symbian backend for QtMultimedia audio
  Modified configure to detect SDK support for Symbian audio backend
  Added implementation of epocRoot() function to configure
  Removed duplicated implementation of readRegistryKeys from configure
  Factored epocRoot implementation out of qmake
  ...

8 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration
Qt Continuous Integration System [Fri, 19 Feb 2010 19:32:53 +0000 (20:32 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (81 commits)
  Revert "Speed up QmlGraphicsItem::setParentItem."
  Fix dynamic example
  More strict type checking of ListElement properties.
  Fix tst_QmlGraphicsLoader::networkRequestUrl autotest.
  Fix tst_qmlgraphicstextedit::delegateLoading autotest
  Delete the QmlImageRequestHandler in the correct thread.
  Fix "AnimatedImage ignores Anchors setting"
  Remove unused function that breaks build on AIX.
  doc
  Add support for startDragDistance in qmlviewer.
  Add pixmap benchmarks and make cached rounded rect the same as Rectangle.
  Make QmlDom API internal
  Compile fix with namepaces
  Doc: reformulate why we build a button
  Removed incorrect Q_UNUSED() macro from QmlPropertyAnimation::transition
  Doc: onExited, onEntered only work when button pressed or hoverEnabled
  Ensure visibleIndex and currentIndex are updated on itemsMoved().
  QmlView API review. See QmlChanges.txt for details.
  Fix example after introduction of RotationAnimation.
  Animation doc fix.
  ...

8 years agoAdd convenience function QTextCursor::positionInBlock()
mae [Fri, 19 Feb 2010 17:45:23 +0000 (18:45 +0100)]
Add convenience function QTextCursor::positionInBlock()

We have a missleading function QTextCursor::columnNumber() since 4.2,
which almost never returns what you want.

The pattern cursor.position() - cursor.block().position() is used
frequently in code using QTextCursor.

Reviewed-by: Roberto Raggi
8 years agoGet rid of the unfriendly ImportedNamespace::isBuiltin flag.
Roberto Raggi [Fri, 19 Feb 2010 17:16:36 +0000 (18:16 +0100)]
Get rid of the unfriendly ImportedNamespace::isBuiltin flag.

The `isBuiltin' flag doesn't play nice with hybrid apps where the types
in a namespace are provided by both C++ and QML code.

Done-with: mae

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Fri, 19 Feb 2010 17:09:43 +0000 (18:09 +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: Check if TCP/HTTP connection got re-used
  Fix building in a namespace on Windows
  Ensure that posted events are sent on Windows

8 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Fri, 19 Feb 2010 15:59:17 +0000 (16:59 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (128 commits)
  Fixed QGraphicsScene autotest failure in task250680_childClip.
  Fix fallback for QStaticText when it's unsupported in paint engine
  Skip OpenGL threading tests on Mac as they were causing reboots
  Fixed compile of autotests.
  Fix warnings on gcc
  Add experimental VBO support for drawCachedGlyphs()'s index array
  Fix threaded gl autotest build failure on GLES2
  Removed redundant debug output from trace benchmark.
  Added two QML based traces to trace benchmark.
  Fixed old trace files no longer working.
  Reduced the memory footprint of qttrace files.
  Added trace replayer benchmark.
  Added --range and --single arguments to qttracereplay.
  Always accept values reported directly using QTest::setBenchmarkResult.
  Make threading use-cases work for X11
  Run firstRun initialization in declarative/painting benchmark
  Optimization for text drawing on OpenGL
  Enable QStaticText in QtDeclarative painting benchmark
  Fix no-webkit compiler helpviewer
  Make sure height of glyph cache is a power of two
  ...

8 years agoFixed QGraphicsScene autotest failure in task250680_childClip.
Samuel Rødal [Fri, 19 Feb 2010 15:32:15 +0000 (16:32 +0100)]
Fixed QGraphicsScene autotest failure in task250680_childClip.

The path comparison is too strict. Even though the paths are equivalent
(represent the same area) the comparison fails as they don't have the
same representation. If we simplify the clip path and use the more
generic path comparison approach from the QPathClipper autotest the test
passes.

Reviewed-by: Olivier Goffart
8 years agoFixed URL in Russian translation.
Robert Loehning [Fri, 19 Feb 2010 14:39:56 +0000 (15:39 +0100)]
Fixed URL in Russian translation.

Reviewed-by: hjk
8 years agoAdded QmlExtensionPlugin and QmlExtensionInterface.
Roberto Raggi [Fri, 19 Feb 2010 14:29:33 +0000 (15:29 +0100)]
Added QmlExtensionPlugin and QmlExtensionInterface.

8 years agoIntroduced a new parser for qmldir files.
Roberto Raggi [Fri, 19 Feb 2010 14:21:35 +0000 (15:21 +0100)]
Introduced a new parser for qmldir files.

8 years agoIntroduced the internal virtual method QmlView::setRootObject(object).
Roberto Raggi [Fri, 19 Feb 2010 13:10:54 +0000 (14:10 +0100)]
Introduced the internal virtual method QmlView::setRootObject(object).

Done-with: mae

8 years agoMerge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2
Eskil Abrahamsen Blomfeldt [Fri, 19 Feb 2010 15:08:45 +0000 (16:08 +0100)]
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2

8 years agouse egl properties when creating surfaces on symbian
Lars Knoll [Fri, 19 Feb 2010 14:12:28 +0000 (15:12 +0100)]
use egl properties when creating surfaces on symbian

We are currently getting non premultiplied surfaces
on symbian since we do not forward the egl properties
that we'd like to have to the driver.

Reviewed-By: Jason Barron
8 years agoFix fallback for QStaticText when it's unsupported in paint engine
Eskil Abrahamsen Blomfeldt [Fri, 19 Feb 2010 15:02:56 +0000 (16:02 +0100)]
Fix fallback for QStaticText when it's unsupported in paint engine

When the paint engine does not support QStaticText, we fall back to
regular drawText() calls. This fallback would previously paint all
text to (0, 0). This fixes the qstatictext autotest on Linux.

Reviewed-by: Olivier
8 years agowork around the current include file structure on Symbian^3
Lars Knoll [Fri, 19 Feb 2010 14:55:45 +0000 (15:55 +0100)]
work around the current include file structure on Symbian^3

Reviewed-By: Iain
8 years agoGet rid of the dependency on the Symbian app layer
Lars Knoll [Fri, 19 Feb 2010 14:07:31 +0000 (15:07 +0100)]
Get rid of the dependency on the Symbian app layer

miutset.h is coming from the app layer that we
are not supposed to use. Since we still need the
constant we're better off working around the
dependency and to forward declare the
one constant we need from the file.

Reviewed-By: Iain
8 years agoFix incorrect license headers
Gareth Stockwell [Fri, 19 Feb 2010 14:39:48 +0000 (14:39 +0000)]
Fix incorrect license headers

Forgot to fill in the module name in 4cabe964.

8 years agoMerge branch '4.6' of S:\dynamic\git\qt\trolltech\qt-s60-public.git\ into 4.6
Gareth Stockwell [Fri, 19 Feb 2010 14:34:04 +0000 (14:34 +0000)]
Merge branch '4.6' of S:\dynamic\git\qt\trolltech\qt-s60-public.git\ into 4.6

8 years agoFix incorrect license headers
Gareth Stockwell [Fri, 19 Feb 2010 14:32:17 +0000 (14:32 +0000)]
Fix incorrect license headers

Fixes incorrect license headers used on files added by 28610950.

8 years agoAdded exception to destdir location for abld and sbsv2.
axis [Fri, 19 Feb 2010 14:06:59 +0000 (15:06 +0100)]
Added exception to destdir location for abld and sbsv2.

It was supposed to be in my last commit, but I forgot it.

8 years agotst_qnetworkreply: Check if TCP/HTTP connection got re-used
Markus Goetz [Fri, 19 Feb 2010 12:49:58 +0000 (13:49 +0100)]
tst_qnetworkreply: Check if TCP/HTTP connection got re-used

Reviewed-by: Peter Hartmann
8 years agoFix bad conflict resolution from 4baa9dfb5273d7b501dcb3f456983262c53cc8d1
Thiago Macieira [Fri, 19 Feb 2010 14:00:55 +0000 (15:00 +0100)]
Fix bad conflict resolution from 4baa9dfb5273d7b501dcb3f456983262c53cc8d1

Reviewed-by: Denis Dzyubenko
8 years agoMerge remote branch 'origin/4.6' into qt-master-from-4.6
Thiago Macieira [Fri, 19 Feb 2010 13:49:33 +0000 (14:49 +0100)]
Merge remote branch 'origin/4.6' into qt-master-from-4.6

Conflicts:
tools/assistant/lib/qhelpsearchindexreader_clucene_p.h

8 years agoFix building in a namespace on Windows
Andy Shaw [Fri, 19 Feb 2010 13:47:38 +0000 (14:47 +0100)]
Fix building in a namespace on Windows

Reviewed-by: hjk
8 years agoRevert "Speed up QmlGraphicsItem::setParentItem."
Bjørn Erik Nilsen [Fri, 19 Feb 2010 11:21:45 +0000 (12:21 +0100)]
Revert "Speed up QmlGraphicsItem::setParentItem."

This reverts commit 282a46ab5edafa7b82e9c58658143cb979db2d85.

This change introduced some regression due to itemChange notifications
not being delivered as expected (reported by Warwick). We have to find
another solution, unfortunately. However, the performance penalty isn't
that big so we can live with it for now.

8 years agoSupressed Icon sizes on QPushButton in QS60Style
Sami Merila [Fri, 19 Feb 2010 12:23:47 +0000 (14:23 +0200)]
Supressed Icon sizes on QPushButton in QS60Style

QS60Style should have smaller button margins when icon height is
larger than text height within a button.

Task-number: QTBUG-7586
Reviewed-by: Alessandro Portale
8 years agoEnsure that posted events are sent on Windows
Bradley T. Hughes [Fri, 19 Feb 2010 12:12:06 +0000 (13:12 +0100)]
Ensure that posted events are sent on Windows

Commit f21d183 introduced a GetMessage hook that would try to post
a message to the Windows queue if the hook received an event that was
not the WM_QT_SENDPOSTEDEVENTS message.

However, the logic used is flawed, and would never post the message
unless we received a message for a window that was not the event
dispatcher's internal window. Timer messages DO go to the internal
window, and the last handled timer message SHOULD trigger the hook
to post a new WM_QT_SENDPOSTEDEVENTS, but due to the flawed logic, it
would not.

The most notable side effect of this bug is that regular repaints and
animations would not become visible unless the user moved the mouse
or used the keyboard.

Task-number: QTBUG-7728
Reviewed-by: Andreas Aardal Hanssen
Fix verified by 2 users in the Jira report mentioned above.

8 years agoFixed off-by-one blending errors in the NEON drawhelper code.
Samuel Rødal [Fri, 19 Feb 2010 10:35:17 +0000 (11:35 +0100)]
Fixed off-by-one blending errors in the NEON drawhelper code.

For example blending alpha 0xff with alpha 0xff and a 0.5 opacity gave
a result of 0xfe instead of the correct 0xff. This caused some
autotests to fail on ARM/NEON.

Reviewed-by: TrustMe
8 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Fri, 19 Feb 2010 11:57:58 +0000 (12:57 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (126 commits)
  Skip OpenGL threading tests on Mac as they were causing reboots
  Fixed compile of autotests.
  Fix warnings on gcc
  Add experimental VBO support for drawCachedGlyphs()'s index array
  Fix threaded gl autotest build failure on GLES2
  Removed redundant debug output from trace benchmark.
  Added two QML based traces to trace benchmark.
  Fixed old trace files no longer working.
  Reduced the memory footprint of qttrace files.
  Added trace replayer benchmark.
  Added --range and --single arguments to qttracereplay.
  Always accept values reported directly using QTest::setBenchmarkResult.
  Make threading use-cases work for X11
  Run firstRun initialization in declarative/painting benchmark
  Optimization for text drawing on OpenGL
  Enable QStaticText in QtDeclarative painting benchmark
  Fix no-webkit compiler helpviewer
  Make sure height of glyph cache is a power of two
  Fixes crash when destroying a QGraphicsItem.
  Move benchmarks/qvector to benchmarks/corelib/tools/qvector
  ...

8 years agoFix dynamic example
Alan Alpert [Fri, 19 Feb 2010 11:15:43 +0000 (12:15 +0100)]
Fix dynamic example

Dynamic property creation appears to have been restricted.

8 years agoFixed libstdcpp.dll version autodetection for Symbian
Miikka Heikkinen [Fri, 19 Feb 2010 10:38:30 +0000 (12:38 +0200)]
Fixed libstdcpp.dll version autodetection for Symbian

Libstdcpp.dll version autodetection was broken for clean builds,
so made it default for new version when neither new or old can be
detected.

Task-number: QT-1171
Reviewed-by: Janne Anttila
8 years agoMoved the "sis" target and friends from cpp code to qmake profiles.
axis [Thu, 18 Feb 2010 12:13:29 +0000 (13:13 +0100)]
Moved the "sis" target and friends from cpp code to qmake profiles.

This was done in order to use the same targets for multiple mkspecs.

The "store_build" target of sbsv2 had to remain separate, because it
depends on using flms.

RevBy:    Miikka Heikkinen

8 years agoMerge branch '4.6' of S:\dynamic\git\qt\trolltech\qt-s60-public.git\ into 4.6
Gareth Stockwell [Fri, 19 Feb 2010 10:28:12 +0000 (10:28 +0000)]
Merge branch '4.6' of S:\dynamic\git\qt\trolltech\qt-s60-public.git\ into 4.6

8 years agoFixed linkage failure when building qmake on Unix platforms
Gareth Stockwell [Fri, 19 Feb 2010 10:16:34 +0000 (11:16 +0100)]
Fixed linkage failure when building qmake on Unix platforms

Commits f641369c/5254184c and 13cb80be/6ebcf2c2 caused registry.o
and epocroot.o respectively to be included twice during the
linkage step of qmake/Makefile.unix.

8 years agoFactored epocRoot implementation out of qmake
Gareth Stockwell [Wed, 10 Feb 2010 14:57:51 +0000 (14:57 +0000)]
Factored epocRoot implementation out of qmake

This function is now implemented in its own source file, rather
than being embedded within the Symbian qmake generator.

The motivation for this is to allow code to be shared between
qmake and configure - the latter needs to determine the epoc
root path in order to perform feature detection on Symbian SDKs.

Reviewed-by: Miikka Heikkinen
8 years agoFactored readRegistryKey implementation out of qmake
Gareth Stockwell [Wed, 10 Feb 2010 13:20:09 +0000 (13:20 +0000)]
Factored readRegistryKey implementation out of qmake

This function is now implemented with its own header and source
files, rather than being embedded within the MSVC qmake generator.

The motivation for this is to allow code to be shared between
qmake and configure, both of which query the registry when built for
Windows.

Reviewed-by: Miikka Heikkinen
8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Fri, 19 Feb 2010 10:00:32 +0000 (11:00 +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:
  Cetest extensions for Windows Mobile device power operations.
  Remote lib extensions for Windows Mobile device power operations.

8 years agoCetest extensions for Windows Mobile device power operations.
ninerider [Fri, 19 Feb 2010 09:50:47 +0000 (10:50 +0100)]
Cetest extensions for Windows Mobile device power operations.

Options to reset (-reset) and change the power mode (-wake)
of the device were added. The reset is needed to put the
device in a defined state after an error has occurred.
The unattended power mode ensures that the reset can be
effected and that the device will not go to sleep.

Reviewed by: Joerg

8 years agoRemote lib extensions for Windows Mobile device power operations.
ninerider [Fri, 19 Feb 2010 09:48:27 +0000 (10:48 +0100)]
Remote lib extensions for Windows Mobile device power operations.

Function to change the power mode and to reset the
device were added. The reset is needed to put the
device in a defined state after an error has occurred.
The unattended power mode ensures that the reset can be
effected and that the device will not go to sleep.

Reviewed by: Joerg

8 years agoColorDialog is always shown as stripped-down version (for QVGA)
Sami Merila [Fri, 19 Feb 2010 09:43:35 +0000 (11:43 +0200)]
ColorDialog is always shown as stripped-down version (for QVGA)

QColorDialog creates own instance of S60Data and fetches touch support
value from that. Unfortunately, newly created S60Data is populated
with default values that claim no support for touch.

As a fix, QColorDialog uses the global variable "S60" to fetch touch
support information.

Task-number: QTBUG-8322
Reviewed-by: Shane Kearns
8 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Sami Merila [Fri, 19 Feb 2010 09:03:20 +0000 (11:03 +0200)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6

8 years agoVirtual keyboard can't be closed anymore after tapping the text area
Sami Merila [Fri, 19 Feb 2010 08:58:13 +0000 (10:58 +0200)]
Virtual keyboard can't be closed anymore after tapping the text area

On Symbian^3, the virtual keyboard cannot be closed anymore
when the editor area where the text is displayed is tapped and
autocompletion is suggesting a word currently.

This is caused by the fragile native FEP manager which assumes that
client must report certain event (EAknCursorPositionChanged), after
user interaction with the editor area. Otherwise the native FEP
manager is in dead-lock, until somebody reports this event to it.

Task-number: QTBUG-7828
Reviewed-by: axis
8 years agoRevert "Factored readRegistryKey implementation out of qmake"
axis [Fri, 19 Feb 2010 08:56:47 +0000 (09:56 +0100)]
Revert "Factored readRegistryKey implementation out of qmake"

This reverts commit f641369ceb7b7e2f95b9d0656b34c0517c5b95f7.

It breaks non-Symbian platforms.

8 years agoRevert "Factored epocRoot implementation out of qmake"
axis [Fri, 19 Feb 2010 08:50:34 +0000 (09:50 +0100)]
Revert "Factored epocRoot implementation out of qmake"

This reverts commit 13cb80be958c40077245cbc4b36448a661e30c64.

It breaks non-Symbian platforms.

8 years agoSkip OpenGL threading tests on Mac as they were causing reboots
Tom Cooksey [Fri, 19 Feb 2010 08:25:40 +0000 (09:25 +0100)]
Skip OpenGL threading tests on Mac as they were causing reboots

Reviewed-By: TrustMe
8 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into master...
Qt Continuous Integration System [Fri, 19 Feb 2010 08:07:22 +0000 (09:07 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team: (101 commits)
  QT5; Add back volume notification.
  Use old notification name for OSX < 10.6.
  QT7; make compile on 10.5.
  Lowercase Q to uppercase in QML elment URI.
  Complete namespace move; QtMedia -> QtMultimedia
  QuickTime playback backend: listen for natural size changes and update
  Use the qmlmodule method for adding multimedia qml elements.
  Revert "Added multimedia to qmlviewer"
  Change namespace; QtMedia -> QtMultimedia
  Quicktime playback backend: Recreate the visual context on video native
  QuickTime playback backend: Listen for movie load state changes.
  Switch RGB24 and BGR24 shaders back.
  Disable the full screen video widget tests on X11.
  Use the IPropertyBag interface to get audio device names.
  Fix qmlgraphicsvideo.pro
  Add qmlgraphicsvideo test to auto.pro
  Fix QMediaServiceProvider test.
  Make QMediaPlaylist test pass.
  Fix QMediaPlayer test failure.
  Fix qmlaudio.pro.
  ...

8 years agoQT5; Add back volume notification.
Justin McPherson [Fri, 19 Feb 2010 07:49:28 +0000 (17:49 +1000)]
QT5; Add back volume notification.

8 years agoDesigner/Resourceview: Suppress warning about QFileInfo on empty path.
Friedemann Kleint [Fri, 19 Feb 2010 07:44:16 +0000 (08:44 +0100)]
Designer/Resourceview: Suppress warning about QFileInfo on empty path.

8 years agoUse old notification name for OSX < 10.6.
Justin McPherson [Fri, 19 Feb 2010 07:40:10 +0000 (17:40 +1000)]
Use old notification name for OSX < 10.6.

8 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Warwick Allison [Fri, 19 Feb 2010 07:26:12 +0000 (17:26 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml

8 years agoMore strict type checking of ListElement properties.
Warwick Allison [Fri, 19 Feb 2010 07:18:42 +0000 (17:18 +1000)]
More strict type checking of ListElement properties.

Task-number: QTBUG-6203

8 years agoQT7; make compile on 10.5.
Justin McPherson [Fri, 19 Feb 2010 07:15:05 +0000 (17:15 +1000)]
QT7; make compile on 10.5.

8 years agoMerge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team
Justin McPherson [Fri, 19 Feb 2010 07:12:33 +0000 (17:12 +1000)]
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team