qt:qt.git
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration v4.8.0-beta
Qt Continuous Integration System [Sun, 3 Jul 2011 11:46:09 +0000 (21:46 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Doc: Fixing typo

10 years agoDoc: Fixing typo
Sergio Ahumada [Sat, 2 Jul 2011 10:59:09 +0000 (12:59 +0200)]
Doc: Fixing typo

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration
Qt Continuous Integration System [Sat, 2 Jul 2011 07:41:59 +0000 (17:41 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: (41 commits)
  Make sure the declarative plugin of QtWebKit is build once.
  Make sure JavaScriptCore is build once.
  Updated WebKit to a52dbae362a295e0adfb7ee4fdc21734ae4b7b45
  2011-05-23 Matthew Delaney <mdelaney@apple.com>
  Fix headers generation for QtWebKit.
  2011-06-28 Alexis Menard <alexis.menard@openbossa.org>
  Skip QtWebKit as it leaks symbols and add a namespace exception for QtScript.
  Fix the auto-tests of QtWebKit.
  2011-06-27 Joe Wild <joseph.wild@nokia.com>
  2011-06-28 Alexis Menard <alexis.menard@openbossa.org>
  Updated WebKit to d30a30ac4faadcb8b2e282e343c921f919fbca9b
  Updated WebKit to 631751dee41f81af4daa7821f98b1ce8667c4d90
  Updated WebKit to 0de6fbe7d7714e4d2520f84a7d7e0c5ed9a55114
  Make QtWebKit actually works when linked to an application.
  Attempt to get Symbian building with SQLite.
  Make the headers test pass by including QtGui/QColor instead of QColor.
  Fix the in-tree build by not letting qtbase.pri add explicitlib or staticlib to CONFIG.
  Hack RenderBlock's continuation() and setContinuation() for RVCT 2.x.
  Use WTF::notFound instead of -1 to check for Vector::find() errors.
  The autotests don't even build on Symbian, skip them for now.
  ...

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Sat, 2 Jul 2011 04:15:02 +0000 (14:15 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  changelog
  Compile with DEBUG_FONTENGINE define
  minor optimization
  remove the old compatibility code
  make QFontEngineQPF1 work even without mmap(2) support
  Doc: Fixing typo

10 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Sat, 2 Jul 2011 00:30:27 +0000 (10:30 +1000)]
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  Re-apply licenseheader text in source files for qt4.7
  Fix QWidget::palettePropagation2() autotest on Symbian (part 2)
  Fix QWidget::palettePropagation2() autotest on Symbian
  QTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5
  Fix text color in some cases of QML and QStaticText
  Added qmlshadersplugin to Symbian s60installs.pro-file.
  Fix KERN-EXEC 0 errors in symbian bearer plugin

10 years agoMerge branch 4.7 into qt-4.8-from-4.7
Qt Continuous Integration System [Fri, 1 Jul 2011 16:05:55 +0000 (02:05 +1000)]
Merge branch 4.7 into qt-4.8-from-4.7

10 years agochangelog
Harald Fernengel [Fri, 1 Jul 2011 11:26:58 +0000 (13:26 +0200)]
changelog

10 years agoCompile with DEBUG_FONTENGINE define
Harald Fernengel [Fri, 1 Jul 2011 11:13:34 +0000 (13:13 +0200)]
Compile with DEBUG_FONTENGINE define

Trivial fix to make the debug code compile again after latest changes

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Fri, 1 Jul 2011 11:13:00 +0000 (21:13 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Re-apply licenseheader text in source files for qt4.7

10 years agominor optimization
Ritt Konstantin [Fri, 1 Jul 2011 11:07:50 +0000 (13:07 +0200)]
minor optimization

use the cached data from fileinfo rather than re-creating it one line later

Merge-request: 1260
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
10 years agoremove the old compatibility code
Ritt Konstantin [Fri, 1 Jul 2011 11:07:49 +0000 (13:07 +0200)]
remove the old compatibility code

obsoleted by the last commit (and moreover, disabled a while ago)

Merge-request: 1260
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
10 years agomake QFontEngineQPF1 work even without mmap(2) support
Ritt Konstantin [Fri, 1 Jul 2011 11:07:48 +0000 (13:07 +0200)]
make QFontEngineQPF1 work even without mmap(2) support

this also fixes a memory leaking on Integrity
(an allocated data was unmap()'ed rather than free()'d)

Merge-request: 1260
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integ...
Qt Continuous Integration System [Fri, 1 Jul 2011 10:49:16 +0000 (20:49 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
  Cocoa: QFileDialog: fix filename filter not applied correctly
  Fix typo in docs: occurred.
  Cocoa: fix qtabwidget auto test failure
  Cocoa: fix qwidget auto test failures
  Cocoa: Fix qgraphicsproxywidget auto test
  Use Q_SLOTS instead of slots in public headers.
  Fix a11y crash: dock doesn't always have a widget.
  Fix typo in comment.
  Mac: respect WA_ShowWithoutActivating flag
  Remove misleading and incorrect information from dropMimeData docs.
  Provide the resetInternalData slot to cleanly reset data in proxy subclasses.
  Mac: switch raster off as default paint engine

10 years agoRe-apply licenseheader text in source files for qt4.7
Jyri Tahtela [Fri, 1 Jul 2011 08:58:59 +0000 (11:58 +0300)]
Re-apply licenseheader text in source files for qt4.7

Fixed license text in files having old license.

Reviewed-by: Trust Me
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Fri, 1 Jul 2011 07:06:04 +0000 (17:06 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
  Symbian socket engine: remove remaining todo comments
  Symbian: tune network autotest heap size so they can run on emulator
  Fix invalid read in QUrl::removeAllEncodedQueryItems
  Push the data together with the error in the synchronous case.

10 years agoMerge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Liang Qi [Fri, 1 Jul 2011 07:00:13 +0000 (09:00 +0200)]
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/s60installs/s60installs.pro

10 years agoMake sure the declarative plugin of QtWebKit is build once.
Alexis Menard [Thu, 30 Jun 2011 19:46:26 +0000 (16:46 -0300)]
Make sure the declarative plugin of QtWebKit is build once.

In the old WebKit the main pro file was not triggering the build of
the declarative plugin therefore it was added as a child of src.pro. It's not
the case anymore.

Reviewed-by: Andreas Kling
10 years agoDoc: Fixing typo
Sergio Ahumada [Thu, 30 Jun 2011 21:44:57 +0000 (23:44 +0200)]
Doc: Fixing typo

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 30 Jun 2011 21:10:40 +0000 (07:10 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Update 4.8.0 changes file

10 years agoUpdate 4.8.0 changes file
Shane Kearns [Thu, 30 Jun 2011 16:18:33 +0000 (17:18 +0100)]
Update 4.8.0 changes file

10 years agoSymbian socket engine: remove remaining todo comments
Shane Kearns [Thu, 30 Jun 2011 13:52:57 +0000 (14:52 +0100)]
Symbian socket engine: remove remaining todo comments

The writes >16k blocking in the emulator only applies to the winsock
connectivity used in S60 SDKs. It doesn't affect the ethernet
connectivity used by platform environments.

Restarting notifier after error seems like the correct thing to do,
and isn't causing any problems.

The duplicated code for setting error strings is unfortunate, but a
consequence of our decision not to derive from the native socket engine.
If symbian ever gets a Qt5 port, we should revisit it there.

Task-number: QTBUG-18371
Reviewed-by: Markus Goetz
10 years agoSymbian: tune network autotest heap size so they can run on emulator
Shane Kearns [Thu, 30 Jun 2011 13:15:28 +0000 (14:15 +0100)]
Symbian: tune network autotest heap size so they can run on emulator

Heap sizes were increased during development due to OOM failures,
but the tests cannot be launched on emulator because of the address space
problem (symbian emulator known issue)
As the OOM failures were caused by unlimited buffering in the proxy socket
engines (fixed by c4727a85eed57a4db698326a1bed4aa75b6e5284) the tests
work on both emulator and hardware with the new buffer size.

Task-number: QTBUG-18221
Reviewed-by: Markus Goetz
10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team
Qt Continuous Integration System [Thu, 30 Jun 2011 12:12:50 +0000 (22:12 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team:
  Make sure JavaScriptCore is build once.

10 years agoMake sure JavaScriptCore is build once.
Alexis Menard [Thu, 30 Jun 2011 12:04:42 +0000 (09:04 -0300)]
Make sure JavaScriptCore is build once.

In the old WebKit the main pro file was not triggering the build of
JavaScriptCore therefore it was added as a child of src.pro. It's not
the case anymore.

Reviewed-by: Andreas Kling
10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Thu, 30 Jun 2011 09:22:35 +0000 (19:22 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
  Cocoa: QFileDialog: fix filename filter not applied correctly

10 years agoCocoa: QFileDialog: fix filename filter not applied correctly
Richard Moe Gustavsen [Thu, 30 Jun 2011 09:14:32 +0000 (11:14 +0200)]
Cocoa: QFileDialog: fix filename filter not applied correctly

From before, the filename filters set on the dialog were matched
against the full patch of the filenames shown in the dialog. The
correct way is to only match it against the filename. This becomes
evident if you set a filter that has no wild cards, e.g "qmake"

Rev-By: jbache
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 29 Jun 2011 23:05:32 +0000 (09:05 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fix QWidget::palettePropagation2() autotest on Symbian (part 2)
  Fix QWidget::palettePropagation2() autotest on Symbian

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Wed, 29 Jun 2011 21:51:36 +0000 (07:51 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (204 commits)
  Fix vertical positioning of glyphs in raster engine with FreeType
  Ensure a small event check interval on uikit platform.
  Change default application font for uikit platform.
  Use the QPoint memory layout change only on Desktop Mac
  Fix 2cb398e1d901e62384bb2b388761cfd18fc8804a in case of no coreservices
  Make it compile with openssl 1.0.0d, gcc 4.6
  QStringBuilder: do not crash with null char*
  Add IPHONEOS deployment vars to makespec
  Post key events via QWindowSystemInterface, don't post events direcly
  Use nicer fonts and a few little patches to uikit platform.
  Update README and qmlapplicationviewer to suit 4.8.
  Updated proof-of-concept UIKit mkspecs
  Re-apply licenseheader text in source files for qt4.8
  Fix event delevery order
  Reorder variable to eliminate warnings
  Only compare styleNames if they are not empty
  Add styleName to QFontDef comparison
  qsystemlibrary needs no special treatment
  QSocketNotifier autotest - fix compile with MSVC
  my changelog for 4.8.0
  ...

10 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Wed, 29 Jun 2011 21:42:03 +0000 (23:42 +0200)]
Merge branch '4.8-upstream' into master-water

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team
Qt Continuous Integration System [Wed, 29 Jun 2011 20:10:23 +0000 (06:10 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team: (39 commits)
  Updated WebKit to a52dbae362a295e0adfb7ee4fdc21734ae4b7b45
  2011-05-23 Matthew Delaney <mdelaney@apple.com>
  Fix headers generation for QtWebKit.
  2011-06-28 Alexis Menard <alexis.menard@openbossa.org>
  Skip QtWebKit as it leaks symbols and add a namespace exception for QtScript.
  Fix the auto-tests of QtWebKit.
  2011-06-27 Joe Wild <joseph.wild@nokia.com>
  2011-06-28 Alexis Menard <alexis.menard@openbossa.org>
  Updated WebKit to d30a30ac4faadcb8b2e282e343c921f919fbca9b
  Updated WebKit to 631751dee41f81af4daa7821f98b1ce8667c4d90
  Updated WebKit to 0de6fbe7d7714e4d2520f84a7d7e0c5ed9a55114
  Make QtWebKit actually works when linked to an application.
  Attempt to get Symbian building with SQLite.
  Make the headers test pass by including QtGui/QColor instead of QColor.
  Fix the in-tree build by not letting qtbase.pri add explicitlib or staticlib to CONFIG.
  Hack RenderBlock's continuation() and setContinuation() for RVCT 2.x.
  Use WTF::notFound instead of -1 to check for Vector::find() errors.
  The autotests don't even build on Symbian, skip them for now.
  Hack SystemTimeWin.cpp to build on MSVC2005.
  Make Float32Array and Int16Array build on RVCT 2.x.
  ...

10 years agoUpdated WebKit to a52dbae362a295e0adfb7ee4fdc21734ae4b7b45
Alexis Menard [Wed, 29 Jun 2011 19:34:10 +0000 (16:34 -0300)]
Updated WebKit to a52dbae362a295e0adfb7ee4fdc21734ae4b7b45

Reviewed-by: Andreas Kling
10 years ago2011-05-23 Matthew Delaney <mdelaney@apple.com>
Alexis Menard [Mon, 23 May 2011 22:33:39 +0000 (22:33 +0000)]
2011-05-23 Matthew Delaney <mdelaney@apple.com>

        Reviewed by Simon Fraser.

        Remove safeFloatToInt() in FloatRect.cpp and replace with working version of clampToInteger()
        https://bugs.webkit.org/show_bug.cgi?id=58216

        * wtf/MathExtras.h:
        (clampToInteger):
        (clampToPositiveInteger):
2011-05-23  Matthew Delaney  <mdelaney@apple.com>

        Reviewed by Simon Fraser.

        Remove safeFloatToInt() in FloatRect.cpp and replace with working version of clampToInteger()
        https://bugs.webkit.org/show_bug.cgi?id=58216

        No new tests. The SVG tests mask-excessive-malloc.svg and pattern-excessive-malloc.svg exercise this code path.

        * platform/graphics/FloatRect.cpp:
        (WebCore::enclosingIntRect):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@87103 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Signed-off-by: Alexis Menard <alexis.menard@nokia.com>
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Wed, 29 Jun 2011 19:19:04 +0000 (05:19 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  QTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5

10 years agoFix headers generation for QtWebKit.
Alexis Menard [Wed, 29 Jun 2011 18:13:47 +0000 (15:13 -0300)]
Fix headers generation for QtWebKit.

syncqt assumes that the pro files of modules are named the same way as
the directory they are in. QtWebKit 2.2 has its main pro file called
QtWebKit.pro and not qt.pro even if it's located in src/3rdParty/webkit/Source/WebKit/qt.
This patch ensure that syncqt will look for a pro file if there is one in
the directory in the case there isn't one named the same way as the directory.

Reviewed-by:mariusSO

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Wed, 29 Jun 2011 18:16:55 +0000 (04:16 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
  Fix typo in docs: occurred.
  Cocoa: fix qtabwidget auto test failure
  Cocoa: fix qwidget auto test failures
  Cocoa: Fix qgraphicsproxywidget auto test
  Use Q_SLOTS instead of slots in public headers.
  Fix a11y crash: dock doesn't always have a widget.
  Fix typo in comment.
  Mac: respect WA_ShowWithoutActivating flag
  Remove misleading and incorrect information from dropMimeData docs.
  Provide the resetInternalData slot to cleanly reset data in proxy subclasses.
  Mac: switch raster off as default paint engine

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Wed, 29 Jun 2011 15:33:44 +0000 (01:33 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fix text color in some cases of QML and QStaticText

10 years agoFix typo in docs: occurred.
Frederik Gladhorn [Wed, 29 Jun 2011 13:12:50 +0000 (15:12 +0200)]
Fix typo in docs: occurred.

Reviewed-by: gabi
10 years agoCocoa: fix qtabwidget auto test failure
Richard Moe Gustavsen [Wed, 29 Jun 2011 13:01:52 +0000 (15:01 +0200)]
Cocoa: fix qtabwidget auto test failure

The fixed test fails when switching back to native paint engine
as default, as opposed to raster. I'm not really sure why, and I
hate just commenting the test out. But right now it is more important
to 'revert' raster as default for Qt-4.8-beta, than to puzzle with
update optimizations for tab widget.

Rev-by: msorvig
10 years agoCocoa: fix qwidget auto test failures
Richard Moe Gustavsen [Wed, 29 Jun 2011 12:29:14 +0000 (14:29 +0200)]
Cocoa: fix qwidget auto test failures

Some of the test are bound to fail then using the native paint
engine on Mac. They failed before as well, but were swiched on
as a part of the raster engine implementation. But now that we
decide not to go with raster as default after all, be skip some
of the tests again

Rev-By: msorvig
10 years agoFix QWidget::palettePropagation2() autotest on Symbian (part 2)
Sami Merila [Wed, 29 Jun 2011 11:40:24 +0000 (14:40 +0300)]
Fix QWidget::palettePropagation2() autotest on Symbian (part 2)

Add also include to QS60Style to avoid build failure.

Task-number: QT-5011
Reviewed-by: Miikka Heikkinen
10 years agoCocoa: Fix qgraphicsproxywidget auto test
Richard Moe Gustavsen [Wed, 29 Jun 2011 11:39:31 +0000 (13:39 +0200)]
Cocoa: Fix qgraphicsproxywidget auto test

This test fails for CoreGraphics graphics engine on Cocoa. The reason
is that we less control over when Cocoa sends us updates, and the
size of the region it tells us to update.

Rev-By: msorvig
10 years agoFix QWidget::palettePropagation2() autotest on Symbian
Sami Merila [Wed, 29 Jun 2011 11:36:09 +0000 (14:36 +0300)]
Fix QWidget::palettePropagation2() autotest on Symbian

Autotest fails since calling QApplication::setPalette() clears away
QPalette hash (class specific palette information). QS60Style tries
to re-set theme-specific hash after updating application palette with
real theme background, but does not take into account that application
might have defined own custom palette hash data.

As a fix, store the previously set palette hash information and restore
it after calling QApplication::setPalette(). Additionally, remove the
palette change event sending, since QApplication will post that event
anyway when palette is updated.

Task-number: QT-5011
Reviewed-by: Miikka Heikkinen
10 years agoQTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5
Simo Fält [Fri, 17 Jun 2011 06:31:01 +0000 (09:31 +0300)]
QTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5

Replaced std::cout with QTextStream

Reviewed-by: Eckhart Köppen
(cherry picked from commit f078275a2a4b2a279a6fcc24df3c21fe8b21f007)

10 years agoFix text color in some cases of QML and QStaticText
Eskil Abrahamsen Blomfeldt [Tue, 28 Jun 2011 15:07:13 +0000 (17:07 +0200)]
Fix text color in some cases of QML and QStaticText

This reverts 518c2a58ed6fdfd7449cb4476aa8ea0d32ad16e3 which caused a
regression.

When writing systems are mixed and an underline is set on the font,
QPainter will set a pen with the current color and a new width on
itself before drawing the decoration. This would cause the recorder
in QStaticText to mark the pen as dirty, saving the current pen
color in all subsequent text items. The effect was e.g. that in QML
the cached color would override the current one, making it impossible
to change the color on the text without forcing a relayout somehow.

The right fix is to only mark the pen as dirty when its color actually
changes.

Task-number: QTBUG-20159
Reviewed-by: Jiang Jiang
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Wed, 29 Jun 2011 08:02:38 +0000 (18:02 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
  Fix vertical positioning of glyphs in raster engine with FreeType
  Ensure a small event check interval on uikit platform.
  Change default application font for uikit platform.
  Use the QPoint memory layout change only on Desktop Mac
  Fix 2cb398e1d901e62384bb2b388761cfd18fc8804a in case of no coreservices
  Add IPHONEOS deployment vars to makespec
  Post key events via QWindowSystemInterface, don't post events direcly
  Use nicer fonts and a few little patches to uikit platform.
  Update README and qmlapplicationviewer to suit 4.8.
  Updated proof-of-concept UIKit mkspecs

10 years agoAdded qmlshadersplugin to Symbian s60installs.pro-file.
Marko Niemelä [Wed, 29 Jun 2011 07:52:39 +0000 (10:52 +0300)]
Added qmlshadersplugin to Symbian s60installs.pro-file.

Task-number: QTBUG-18346
Reviewed-by: Sami Merila
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 29 Jun 2011 07:50:00 +0000 (17:50 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Added qmlshadersplugin to Symbian s60installs.pro-file.

10 years ago2011-06-28 Alexis Menard <alexis.menard@openbossa.org>
Alexis Menard [Tue, 28 Jun 2011 21:13:25 +0000 (21:13 +0000)]
2011-06-28 Alexis Menard <alexis.menard@openbossa.org>

        Reviewed by Andreas Kling.

        [Qt] Use <QtX/x.h> style of headers for Qt tests which rely on it.
        https://bugs.webkit.org/show_bug.cgi?id=63562

        Some Qt auto-tests rely on <QtX/x.h> types of includes.

        * Api/qwebkitplatformplugin.h:
        * symbian/platformplugin/qwebkitplatformplugin.h:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@89958 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Signed-off-by: Alexis Menard <alexis.menard@nokia.com>
10 years agoSkip QtWebKit as it leaks symbols and add a namespace exception for QtScript.
Alexis Menard [Tue, 28 Jun 2011 20:43:30 +0000 (17:43 -0300)]
Skip QtWebKit as it leaks symbols and add a namespace exception for QtScript.

The library leaks symbols mostly due to gcc bugs. We can't really test
WebKit.

Reviewed-by: Thiago Macieira
10 years agoFix the auto-tests of QtWebKit.
Alexis Menard [Tue, 28 Jun 2011 17:12:37 +0000 (14:12 -0300)]
Fix the auto-tests of QtWebKit.

The source tree of WebKit was reorganized. The pro files needs to be updated.

Reviewed-by:Andreas Kling

10 years ago2011-06-27 Joe Wild <joseph.wild@nokia.com>
Alexis Menard [Mon, 27 Jun 2011 23:26:18 +0000 (23:26 +0000)]
2011-06-27 Joe Wild <joseph.wild@nokia.com>

        Reviewed by Simon Fraser.

        Crash on www.crave.cnet.com in FrameView::windowClipRect()
        https://bugs.webkit.org/show_bug.cgi?id=56393

        Tests that a plugin of a swf file in a hidden iframe will not
        crash. This test required more than 1 content file and a
        timeout or else it would not repeat the error condition.

        This test will only crash on platforms (like Symbian) that
        don't allow nonvirtual functions to have a null this pointer.

        * plugins/hidden-iframe-with-swf-plugin-expected.txt: Added.
        * plugins/hidden-iframe-with-swf-plugin.html: Added.
        * plugins/resources/iframe-content-with-swf-plugin.html: Added.
2011-06-27  Joe Wild  <joseph.wild@nokia.com>

        Reviewed by Simon Fraser.

        Crash on www.crave.cnet.com in FrameView::windowClipRect()
        https://bugs.webkit.org/show_bug.cgi?id=56393

        Check for a null renderer to fix a crash. This situation can
        arise when external content/plugins is referenced from html
        elements with style="display:none".

        Test: plugins/hidden-iframe-with-swf-plugin.html

        * page/FrameView.cpp:
        (WebCore::FrameView::windowClipRect):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@89876 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Signed-off-by: Alexis Menard <alexis.menard@nokia.com>
10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Tue, 28 Jun 2011 16:39:37 +0000 (02:39 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
  Fix vertical positioning of glyphs in raster engine with FreeType
  Ensure a small event check interval on uikit platform.
  Change default application font for uikit platform.
  Use the QPoint memory layout change only on Desktop Mac
  Fix 2cb398e1d901e62384bb2b388761cfd18fc8804a in case of no coreservices
  Add IPHONEOS deployment vars to makespec
  Post key events via QWindowSystemInterface, don't post events direcly
  Use nicer fonts and a few little patches to uikit platform.
  Update README and qmlapplicationviewer to suit 4.8.
  Updated proof-of-concept UIKit mkspecs

10 years ago2011-06-28 Alexis Menard <alexis.menard@openbossa.org>
Alexis Menard [Tue, 28 Jun 2011 14:22:44 +0000 (14:22 +0000)]
2011-06-28 Alexis Menard <alexis.menard@openbossa.org>

        Reviewed by Andreas Kling.

        [Qt] Use QtQuick imports in Api tests rather than old deprecated Qt 4.x imports.
        https://bugs.webkit.org/show_bug.cgi?id=63533

        We need to use the new QtQuick 1.x imports rather than the old deprecated
        version.

        * tests/qdeclarativewebview/resources/webviewbackgroundcolor.qml:
        * tests/qdeclarativewebview/resources/webviewtest.qml:
        * tests/qdeclarativewebview/resources/webviewtestdefault.qml:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@89923 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Signed-off-by: Alexis Menard <alexis.menard@nokia.com>
10 years agoUse Q_SLOTS instead of slots in public headers.
Frederik Gladhorn [Tue, 28 Jun 2011 14:52:54 +0000 (16:52 +0200)]
Use Q_SLOTS instead of slots in public headers.

Reviewed-by: gabi
10 years agoFix vertical positioning of glyphs in raster engine with FreeType
Jiang Jiang [Tue, 28 Jun 2011 13:53:28 +0000 (15:53 +0200)]
Fix vertical positioning of glyphs in raster engine with FreeType

Reviewed-by: aavit
10 years agoFix invalid read in QUrl::removeAllEncodedQueryItems
Olivier Goffart [Tue, 28 Jun 2011 09:21:00 +0000 (11:21 +0200)]
Fix invalid read in QUrl::removeAllEncodedQueryItems

The remove will detach the string making the query pointer invalid.

Note: the "test3" case is commented out because it does not remove
the & at the end, and i do not want to enforce this behaviour in the
test

Task-number: QTBUG-20065
Change-Id: I195c5c3b468f46c797c7c4f8075303f2b1f4724c
Reviewed-on: http://codereview.qt.nokia.com/822
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
(cherry picked from commit 2dd90a27a82289a5088b929c3bd27c1fd05967f6)

Conflicts:

tests/auto/qurl/tst_qurl.cpp

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Tue, 28 Jun 2011 13:33:45 +0000 (23:33 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fix KERN-EXEC 0 errors in symbian bearer plugin

10 years agoFix KERN-EXEC 0 errors in symbian bearer plugin
Shane Kearns [Tue, 28 Jun 2011 12:08:45 +0000 (13:08 +0100)]
Fix KERN-EXEC 0 errors in symbian bearer plugin

The plugin was ignoring errors when opening a handle, and as a result
crashed if the handle was invalid.
Error checking / handle validity checks added.

Task-number: QTBUG-18572
Reviewed-by: mread
10 years agoFix a11y crash: dock doesn't always have a widget.
Frederik Gladhorn [Tue, 28 Jun 2011 12:37:10 +0000 (14:37 +0200)]
Fix a11y crash: dock doesn't always have a widget.

Also return dock widget title.

Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
10 years agoFix typo in comment.
Frederik Gladhorn [Mon, 20 Jun 2011 12:29:16 +0000 (14:29 +0200)]
Fix typo in comment.

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master...
Qt Continuous Integration System [Tue, 28 Jun 2011 12:32:13 +0000 (22:32 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging:
  Re-apply licenseheader text in source files for qt4.8

10 years agoPush the data together with the error in the synchronous case.
Pierre Rossi [Mon, 27 Jun 2011 18:59:36 +0000 (20:59 +0200)]
Push the data together with the error in the synchronous case.

As it turns out some test cases in QtWebKit rely on this.

Task-number: QTBUG-19556
Reviewed-by: mgoetz
10 years agoMac: respect WA_ShowWithoutActivating flag
Richard Moe Gustavsen [Tue, 28 Jun 2011 10:56:30 +0000 (12:56 +0200)]
Mac: respect WA_ShowWithoutActivating flag

Seems like we just made any window key when showing it, regardless
if WA_ShowWithoutActivating was set. This patch will fix this.

Rev-By: msorvig
10 years agoEnsure a small event check interval on uikit platform.
con [Tue, 28 Jun 2011 10:39:13 +0000 (12:39 +0200)]
Ensure a small event check interval on uikit platform.

For some reason I sometimes get huge nextTimerEvent() values.

10 years agoChange default application font for uikit platform.
con [Tue, 28 Jun 2011 10:13:57 +0000 (12:13 +0200)]
Change default application font for uikit platform.

10 years agoUse the QPoint memory layout change only on Desktop Mac
con [Tue, 28 Jun 2011 09:57:01 +0000 (11:57 +0200)]
Use the QPoint memory layout change only on Desktop Mac

Reviewed-by: gunnar
10 years agoMerge branch '4.8'
Richard Moe Gustavsen [Tue, 28 Jun 2011 09:47:03 +0000 (11:47 +0200)]
Merge branch '4.8'

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Tue, 28 Jun 2011 08:49:27 +0000 (18:49 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
  Reorder variable to eliminate warnings
  Only compare styleNames if they are not empty
  Add styleName to QFontDef comparison

10 years agoFix 2cb398e1d901e62384bb2b388761cfd18fc8804a in case of no coreservices
con [Tue, 28 Jun 2011 07:30:20 +0000 (09:30 +0200)]
Fix 2cb398e1d901e62384bb2b388761cfd18fc8804a in case of no coreservices

Reviewed-by: Ritt Konstantin <ritt.ks@gmail.com>
10 years agoUpdated WebKit to d30a30ac4faadcb8b2e282e343c921f919fbca9b
Alexis Menard [Mon, 27 Jun 2011 21:51:10 +0000 (18:51 -0300)]
Updated WebKit to d30a30ac4faadcb8b2e282e343c921f919fbca9b

Beta1 of QtWebkit 2.2.

Reviewed-by: Andreas Kling
10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Mon, 27 Jun 2011 19:38:23 +0000 (05:38 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (42 commits)
  qsystemlibrary needs no special treatment
  my changelog for 4.8.0
  Use numeric virtual keyboard for all number entry modes.
  Add a function that returns the D-Bus local machine ID
  QTBUG-17776, reporting terminated threads as not running on Symbian
  Splitview - Auto-translation rules changed
  Support clipboard function on Symbian
  Added qmlshadersplugin to Symbian qt.iby-file.
  Add an SSE4.2 even simpler version of toLatin1
  Workaround webkit deadlock on macos x
  QAuthenticator::setUser() parse user name in form user@domain
  tst_qnetworkreply: add a test for http abort.
  Disable antialiasing for tiled image drawing.
  Ensure visibility of input widget in QML app when doing layout switch
  Def update for gui, openvg, and opengl.
  Revert "Def update."
  Fix trailing whitespace
  Remove unnecessary resizes during orientation change
  Revert "Symbian: Fix QFontInfo::pixelSize()"
  Improving warning messages in QVolatileImage.
  ...

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Mon, 27 Jun 2011 18:53:44 +0000 (04:53 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
  Make it compile with openssl 1.0.0d, gcc 4.6
  QStringBuilder: do not crash with null char*
  Fix event delevery order
  QSocketNotifier autotest - fix compile with MSVC

10 years agoRemove misleading and incorrect information from dropMimeData docs.
Stephen Kelly [Sat, 4 Dec 2010 18:48:57 +0000 (19:48 +0100)]
Remove misleading and incorrect information from dropMimeData docs.

It is not the responsibility of the view to insert data into the
model after a dropMimeData call.

10 years agoProvide the resetInternalData slot to cleanly reset data in proxy subclasses.
Stephen Kelly [Thu, 23 Sep 2010 12:14:18 +0000 (14:14 +0200)]
Provide the resetInternalData slot to cleanly reset data in proxy subclasses.

Direct subclasses of QAbstractItemModel are unnaffected as they can update
internal data in a slot connected to the sourceModel's modelReset signal or
layoutChanged signal.

Rehabilitated for 4.8. Should be reverted again in Qt 5.

Reviewed-by: gabi
Merge-request: 694

10 years agoMake it compile with openssl 1.0.0d, gcc 4.6
Bernhard Rosenkraenzer [Mon, 27 Jun 2011 16:12:46 +0000 (18:12 +0200)]
Make it compile with openssl 1.0.0d, gcc 4.6

SSL_ctrl's prototype has changed slightly in openssl 1.0.0x - the 4th
argument is now a void* as opposed to a const void*.
gcc 4.6 doesn't allow this as an implicit cast.

Merge-request: 1239
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integ...
Qt Continuous Integration System [Mon, 27 Jun 2011 15:16:46 +0000 (01:16 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
  Incorrect property name in QAccessibleAbstractSpinBox::setCurrentValue
  When asking for relations, don't crash on children that don't return an interface.
  Remove more inconsistencies with invisible.
  QAccessibleToolButton::text should return accessibleName if set.
  Remove stray semicolon.
  Do not expose text when echo mode is not Normal.
  Check validator when changing text using accessibility functions.
  Fix some issues introduced in df6713b8f55fc007796f40.
  Add tilde (both ~ and ~<userName>) expansion to QFileDialog on UNIX.
  Avoid bogus accessibility focus events from menus.
  Build fix for Mac OS 10.5
  Avoided calling updateAccessibility() from updateMicroFocus if the item was hidden
  Notify a11y framework of FocusChanges for QGraphicsObject
  Call updateAccessibility on the QGraphicsObject in updateMicroFocus
  Fix updateAccessibility for QGraphicsObjects
  Make accessibility work on Windows with alien

10 years agoQStringBuilder: do not crash with null char*
Olivier Goffart [Mon, 27 Jun 2011 11:09:23 +0000 (13:09 +0200)]
QStringBuilder: do not crash with null char*

This is supported by the others operator+

Change-Id: I9a1d1a0afb63acf32935948111d43ca6da370363
Reviewed-on: http://codereview.qt.nokia.com/764
Reviewed-by: hjk
(cherry picked from commit 53a16752c257d2f4f99ecef2cde1580b817fc12a)

10 years agoAdd IPHONEOS deployment vars to makespec
Ian [Mon, 27 Jun 2011 10:33:50 +0000 (12:33 +0200)]
Add IPHONEOS deployment vars to makespec

Merge-request: 1275
Reviewed-by: con
10 years agoPost key events via QWindowSystemInterface, don't post events direcly
Ian [Mon, 20 Jun 2011 14:19:11 +0000 (16:19 +0200)]
Post key events via QWindowSystemInterface, don't post events direcly

Merge-request: 1275
Reviewed-by: con
10 years agoUse nicer fonts and a few little patches to uikit platform.
Ian [Mon, 20 Jun 2011 13:26:26 +0000 (15:26 +0200)]
Use nicer fonts and a few little patches to uikit platform.

Merge-request: 1275
Reviewed-by: con
10 years agoUpdate README and qmlapplicationviewer to suit 4.8.
con [Mon, 27 Jun 2011 12:16:11 +0000 (14:16 +0200)]
Update README and qmlapplicationviewer to suit 4.8.

10 years agoUpdated proof-of-concept UIKit mkspecs
Ian [Tue, 21 Jun 2011 09:02:14 +0000 (11:02 +0200)]
Updated proof-of-concept UIKit mkspecs

Merge-request: 1275
Reviewed-by: con
10 years agoMerge remote-tracking branch 'qt-mainline/4.8'
aavit [Mon, 27 Jun 2011 13:43:22 +0000 (15:43 +0200)]
Merge remote-tracking branch 'qt-mainline/4.8'

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team
Qt Continuous Integration System [Mon, 27 Jun 2011 13:24:49 +0000 (23:24 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team:
  Re-apply licenseheader text in source files for qt4.8

10 years agoRe-apply licenseheader text in source files for qt4.8
Jyri Tahtela [Mon, 27 Jun 2011 13:18:20 +0000 (16:18 +0300)]
Re-apply licenseheader text in source files for qt4.8

New files after previous license change round.

Reviewed-by: Trust Me
10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Mon, 27 Jun 2011 11:56:15 +0000 (21:56 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
  Reorder variable to eliminate warnings

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master...
Qt Continuous Integration System [Mon, 27 Jun 2011 11:38:51 +0000 (21:38 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging:
  QTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5

10 years agoFix event delevery order
Olivier Goffart [Fri, 24 Jun 2011 15:26:20 +0000 (17:26 +0200)]
Fix event delevery order

Some functions (such as QObject::moveToThread) did not keep
the event ordered by priority.
And because qUpperBound is used to add events, that mean new
events would not be inserted in order.

Task-number: QTBUG19637
Change-Id: I38eb9addb1cdd45b8566e000361ac6e5f1f2c2b8
Reviewed-on: http://codereview.qt.nokia.com/733
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
(cherry picked from commit 7eeabcf70db658bca847498f618a94a375c95f5f)

10 years agoReorder variable to eliminate warnings
Jiang Jiang [Sat, 25 Jun 2011 14:59:26 +0000 (16:59 +0200)]
Reorder variable to eliminate warnings

Reviewed-by: Frederik Gladhorn
10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team
Qt Continuous Integration System [Mon, 27 Jun 2011 08:54:55 +0000 (18:54 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (182 commits)
  qsystemlibrary needs no special treatment
  my changelog for 4.8.0
  Use numeric virtual keyboard for all number entry modes.
  Add a function that returns the D-Bus local machine ID
  QTBUG-17776, reporting terminated threads as not running on Symbian
  Splitview - Auto-translation rules changed
  Support clipboard function on Symbian
  Added qmlshadersplugin to Symbian qt.iby-file.
  Add an SSE4.2 even simpler version of toLatin1
  Skip boundry neutral characters in bidi itemization
  Workaround webkit deadlock on macos x
  symbian socket engine: resolve some fixme and todo items
  trivial: fix typo in comment
  Fix QDeclarativeInspector when starting with ,block
  changelog
  docu update for QNX 6.5
  get rid of anacronysm
  massive improvements for the QNX screen driver
  massive improvements for the QNX mouse driver
  massive improvements for the QNX keyboard driver
  ...

10 years agoMerge remote-tracking branch 'qt/4.8'
Jyri Tahtela [Mon, 27 Jun 2011 08:47:01 +0000 (11:47 +0300)]
Merge remote-tracking branch 'qt/4.8'

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Mon, 27 Jun 2011 08:20:27 +0000 (18:20 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
  Only compare styleNames if they are not empty
  Add styleName to QFontDef comparison

10 years agoOnly compare styleNames if they are not empty
Jiang Jiang [Mon, 27 Jun 2011 08:15:39 +0000 (10:15 +0200)]
Only compare styleNames if they are not empty

Task-number: QTBUG-19366

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Mon, 27 Jun 2011 07:56:23 +0000 (17:56 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
  Fix broken rpath on wayland
  Make sure to call damage on the buffer when we damage it
  Update the wayland plugin

10 years agoAdd styleName to QFontDef comparison
Jiang Jiang [Thu, 23 Jun 2011 12:19:48 +0000 (14:19 +0200)]
Add styleName to QFontDef comparison

To make sure we cache different font engines with different style
names.

Task-number: QTBUG-19366

10 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Fri, 24 Jun 2011 21:50:54 +0000 (07:50 +1000)]
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (28 commits)
  Use numeric virtual keyboard for all number entry modes.
  QTBUG-17776, reporting terminated threads as not running on Symbian
  Splitview - Auto-translation rules changed
  Support clipboard function on Symbian
  Added qmlshadersplugin to Symbian qt.iby-file.
  Workaround webkit deadlock on macos x
  Disable antialiasing for tiled image drawing.
  Ensure visibility of input widget in QML app when doing layout switch
  Def update for gui, openvg, and opengl.
  Revert "Def update."
  Fix trailing whitespace
  Remove unnecessary resizes during orientation change
  Revert "Symbian: Fix QFontInfo::pixelSize()"
  Improving warning messages in QVolatileImage.
  Proper naming for raster pixmap and paintengine on Symbian.
  Def update.
  Handle QVolatileImage-backed pixmaps optimally in drawPixmap().
  Resizable graphicsview's background is drawn incorrectly in splitview
  Add inputcontext reset to orientation switch in Symbian
  QS60Style: QGroupBox is drawn as white box in upcoming Symbian release
  ...

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Fri, 24 Jun 2011 18:09:46 +0000 (04:09 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  qsystemlibrary needs no special treatment

10 years agoqsystemlibrary needs no special treatment
Oswald Buddenhagen [Fri, 24 Jun 2011 14:00:19 +0000 (16:00 +0200)]
qsystemlibrary needs no special treatment

this was just a merge artifact

10 years agoQSocketNotifier autotest - fix compile with MSVC
Shane Kearns [Fri, 24 Jun 2011 14:08:28 +0000 (15:08 +0100)]
QSocketNotifier autotest - fix compile with MSVC

Reviewed-By: Sergio Ahumada
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Fri, 24 Jun 2011 09:56:09 +0000 (19:56 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
  my changelog for 4.8.0
  QAuthenticator::setUser() parse user name in form user@domain
  tst_qnetworkreply: add a test for http abort.
  Fix a case of SP_MediaSkipForward returning the wrong pixmap.
  fix an incorrect OpenMode flags handling in QBuffer::open()
  move some internal helper functions from qglobal.cpp to qcore_mac*
  make the previous change foolproof
  get rid of extra copying (another one)
  get rid of extra copying
  add a benchmark for QCFString
  Fix errors in qsocketnotifier test