qt:bada-lighthouse.git
8 years agoThe constructor of a class should not be accessed directly. lighthouse
Benjamin Poulain [Fri, 12 Feb 2010 16:58:39 +0000 (17:58 +0100)]
The constructor of a class should not be accessed directly.

GCC 4.5 is a more strict with direct access to the constructor
and generate an error.

Reviewed-by: Jeremy Katz
8 years agoMinimaldfb: try to make pixelformat of window the same as the layer
Jørgen Lind [Mon, 22 Feb 2010 13:13:35 +0000 (14:13 +0100)]
Minimaldfb: try to make pixelformat of window the same as the layer

8 years agoadded some documentation
Jeremy Katz [Wed, 17 Feb 2010 10:34:30 +0000 (11:34 +0100)]
added some documentation

8 years agomake qvfb plugin compile - QApplicationPrivate -> QWindowSystemInterface
Jeremy Katz [Fri, 12 Feb 2010 15:32:20 +0000 (16:32 +0100)]
make qvfb plugin compile - QApplicationPrivate -> QWindowSystemInterface

8 years agomove methods that shouldn't be used by plugins out of QWindowSystemInterface
Jeremy Katz [Fri, 12 Feb 2010 15:31:30 +0000 (16:31 +0100)]
move methods that shouldn't be used by plugins out of QWindowSystemInterface

8 years agoMove user event handling into QWindowSystemInterface class
Jeremy Katz [Wed, 10 Feb 2010 15:31:13 +0000 (16:31 +0100)]
Move user event handling into QWindowSystemInterface class

This currently includes mouse, wheel, keyboard, enter, leave, geometry,
and close events. Windowing system plugins should limit themselves to
the QWindowSystemInterface::handle*Event() methods, as the other methods
will likely become private.

8 years agoMerge remote branch 'remotes/qt/4.6' into lighthouse
Paul Olav Tvete [Wed, 10 Feb 2010 10:04:29 +0000 (11:04 +0100)]
Merge remote branch 'remotes/qt/4.6' into lighthouse

Conflicts:
configure
tests/auto/qwidget/tst_qwidget.cpp

8 years agoDon't resize back buffer for every window resize; only do it when we're painting
Paul Olav Tvete [Mon, 8 Feb 2010 11:56:46 +0000 (12:56 +0100)]
Don't resize back buffer for every window resize; only do it when we're painting

8 years agoAdded basic fps calculation in qbackingstore
Jørgen Lind [Wed, 10 Feb 2010 09:46:13 +0000 (10:46 +0100)]
Added basic fps calculation in qbackingstore

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Wed, 10 Feb 2010 01:34:42 +0000 (02:34 +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:
  Add the download URI for smart installer package to documentation
  Catch up symbianutils to creator 3efdb87682a5785bac7b90f9f9a8bb819a1cb053
  rename trk -> symbianutils
  Catch up TRK library to creator f2b3e9f2dfbc580389b9b683a3e46e5a8422f55b
  Fixed defect in handling of expose events for Symbian
  Added qwidget test case which displays a native child widget
  Fix tst_QAbstractItemView::task250754_fontChange and tst_QAbstractItemView::QTBUG6407_extendedSelection for Symbian & 5800

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Tue, 9 Feb 2010 22:40:42 +0000 (23:40 +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:
  Tidy the changes file.
  Skip the transparent pixels when doing the sourceOver
  Refactor comp_func_solid_Clear() and comp_func_solid_Source()
  Add mingw-specific expected failures for JS test suite
  QNAM HTTP: Forgot to remove a qDebug()
  QNAM HTTP: Reserve bytes for HTTP parsing
  Add platform-specific expected failures for JS test suite
  Skip test that crashes on win32-g++
  QNetworkCookie(Jar): fix includes
  QNAM HTTP: Improve readHeader() of the HTTP reply
  Add QSKIP to functionEntryAndExit_builtin.
  QNAM HTTP: Improve parseStatus() of HTTP reply
  Demo browser: Better handleUnsupportedContent implementation
  demo browser: Fix the way warnings were (not) displayed
  doc: Updated deployment OS X requirements for 4.6

8 years agoAdd the download URI for smart installer package to documentation
Shane Kearns [Tue, 9 Feb 2010 19:04:09 +0000 (20:04 +0100)]
Add the download URI for smart installer package to documentation

Task-number: QTBUG-8068
Reviewed-by: David Boddie
8 years agoCatch up symbianutils to creator 3efdb87682a5785bac7b90f9f9a8bb819a1cb053
Shane Kearns [Tue, 9 Feb 2010 10:56:37 +0000 (11:56 +0100)]
Catch up symbianutils to creator 3efdb87682a5785bac7b90f9f9a8bb819a1cb053

commit 3efdb87682a5785bac7b90f9f9a8bb819a1cb053
Author: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date:   Mon Feb 8 14:10:51 2010 +0100

    S60/Trk: Make the port a property of TrkDevice.

    Associate the port with the device instead of passing it to open
    for better handling.

commit 76872c6ed8a1477f1914266d6917ee4aad6ff7e9
Author: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date:   Fri Feb 5 17:34:02 2010 +0100

    S60: Move serialdevicelister.cpp to symbianutils/symbiandevicemanager.cpp

8 years agorename trk -> symbianutils
Shane Kearns [Tue, 9 Feb 2010 10:50:08 +0000 (11:50 +0100)]
rename trk -> symbianutils

commit 9c2676167a3aaeb99024a22343c3d998f191a75f
Author: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date:   Fri Feb 5 12:32:32 2010 +0100

    src/shared: Rename trk to symbianutils

8 years agoCatch up TRK library to creator f2b3e9f2dfbc580389b9b683a3e46e5a8422f55b
Shane Kearns [Tue, 9 Feb 2010 10:45:01 +0000 (11:45 +0100)]
Catch up TRK library to creator f2b3e9f2dfbc580389b9b683a3e46e5a8422f55b

This is the last SHA before trk directory is renamed.
Note the \\.\ is prepended to windows com ports inside the library now,
so main.cpp no longer has this windows specific code.

commit f2b3e9f2dfbc580389b9b683a3e46e5a8422f55b
Author: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date:   Fri Feb 5 12:24:46 2010 +0100

    S60/Trk: Change trkutils to be a library of its own.

    To be able to share TrkDevices between Debugger and Qt4ProjectManager.

commit 61c3a260b59433abf8c3ef481ec536af88f8026c
Author: Sarika Kamisetty <sarikak11@gmail.com>
Date:   Thu Feb 4 09:57:54 2010 +0100

    Fix to App TRK connection with 'high COM port' does not work

    Merge-request: 111
Reviewed-by: hjk <qtc-committer@nokia.com>
commit 2fd8b2d7ffa2ac032bfe3a17efe7d152c4cef14d
Author: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date:   Mon Feb 1 12:43:56 2010 +0100

    Fix some code scanning issues.

    QString: Use QChar where appropriate.

commit 805b0a9cc165ef6cd596bd8f5e59f650cd0eebb2
Author: hjk <qtc-committer@nokia.com>
Date:   Mon Feb 1 11:45:44 2010 +0100

    debugger: trk log output cosmetic

commit 75b42f18d886b59dbf3380dd12f39f40005ef08b
Merge: 4320314 a6ca348
Author: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date:   Fri Jan 29 22:49:55 2010 +0100

    Merge remote branch 'origin/1.3'

    Trailing whitespace removal re-applied manually.

commit a6ca348636dd92ab1445cff2286b3293163f5cea
Author: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date:   Fri Jan 29 21:33:57 2010 +0100

    remove trailing whitespace

    doing it in 1.3 as well to avoid possible later conflicts

commit 4ec51219ed5c2150e164473b9c5326b6c68d096a
Author: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date:   Thu Jan 28 17:04:05 2010 +0100

    Trk: Fix source code scanning tool issues.

    showing up in Qt.

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Jason McDonald [Tue, 9 Feb 2010 18:40:02 +0000 (04:40 +1000)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6

8 years agoTidy the changes file.
Jason McDonald [Tue, 9 Feb 2010 18:38:49 +0000 (04:38 +1000)]
Tidy the changes file.

Reviewed-by: Trust Me
8 years agoSkip the transparent pixels when doing the sourceOver
Benjamin Poulain [Tue, 9 Feb 2010 15:58:56 +0000 (16:58 +0100)]
Skip the transparent pixels when doing the sourceOver

Blending fully transparent pixels take a non-negligible time
when webkit use transparent layer. We can avoid that be skipping
those pixels since they have no impact on the final result.

Reviewed-by: Samuel Rødal
8 years agoRefactor comp_func_solid_Clear() and comp_func_solid_Source()
Benjamin Poulain [Tue, 9 Feb 2010 13:52:16 +0000 (14:52 +0100)]
Refactor comp_func_solid_Clear() and comp_func_solid_Source()

Put the common code together with a #define.
Remove the check for the length from comp_func_Clear_impl and
move it to qt_memfill()

8 years agoFixed defect in handling of expose events for Symbian
Gareth Stockwell [Tue, 9 Feb 2010 09:41:29 +0000 (09:41 +0000)]
Fixed defect in handling of expose events for Symbian

Commit bc82db did not correctly handle native child widgets.

Consider the case when we have a top-level widget A with a native
child widget B.  When QSymbianControl::Draw() is called on the
control corresponding to B, the following occurs:
    1. The inExpose flag is set in B's QWExtra structure.
    2. The call to syncBackingStore() results in a call to
       QWidgetBackingStore::flush(), passing default parameters.
    3. Because no target widget was passed to flush(), this
       function selects the top-level widget (A) as the target for
       the flush operation, passing A as the first argument of
       QS60WindowSurface::flush().
    4. QS60WindowSurface::flush() checks the inExpose flag from A's
       QWExtra structure, finds it to be false, and proceeds to
       call DrawNow() on A's control.

Because QSymbianControl::Draw() uses the default graphics context,
this context is shared between controls.  This means that the DrawNow()
call in step 4 causes a WSERV-10 panic (Activate() called on an
already-active) graphics context.

This patch moves the inExpose flag from B's QWExtra into A's QTLWExtra,
with the result that the call to DrawNow() in step 4 is suppressed.

Task-number: QTBUG-7960
Reviewed-by: axis
8 years agoAdded qwidget test case which displays a native child widget
Gareth Stockwell [Tue, 9 Feb 2010 11:37:18 +0000 (11:37 +0000)]
Added qwidget test case which displays a native child widget

As of commit bc82db, show()ing a native child widget causes a panic
on Symbian.  The panic code (WSERV-10) indicates that Activate() is
being called on an already-active graphics context.

This test case reproduces the defect.

Task-number: QTBUG-7960

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
Qt Continuous Integration System [Tue, 9 Feb 2010 16:58:37 +0000 (17:58 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
  Fix warnings ~QX11PixmapData(): QPixmap objects must be destroyed..
  fix a few mistakes in German translation
  Fix Float Conversion in xmlpatterns
  generate code which does not break QT_USE_FAST_CONCATENATION with old gcc
  drastically improve load time of TS files

8 years agoMinimaldfb: fixed include error
Jørgen Lind [Tue, 9 Feb 2010 16:24:50 +0000 (17:24 +0100)]
Minimaldfb: fixed include error

8 years agoFix release build-error in qpaintengine_blitter.cpp
Jørgen Lind [Tue, 9 Feb 2010 15:23:36 +0000 (16:23 +0100)]
Fix release build-error in  qpaintengine_blitter.cpp

8 years agoAdd mingw-specific expected failures for JS test suite
Kent Hansen [Tue, 9 Feb 2010 14:38:44 +0000 (15:38 +0100)]
Add mingw-specific expected failures for JS test suite

8 years agoFix tst_QAbstractItemView::task250754_fontChange and tst_QAbstractItemView::QTBUG6407...
Liang Qi [Tue, 9 Feb 2010 15:05:50 +0000 (16:05 +0100)]
Fix tst_QAbstractItemView::task250754_fontChange and tst_QAbstractItemView::QTBUG6407_extendedSelection for Symbian & 5800

We should consider the difference between Point and Pixel for font size. And also the margin and some other settings in style for views.

Reviewed-by: TrustMe
8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Tue, 9 Feb 2010 14:04:12 +0000 (15:04 +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:
  Setting some parameters to reliably run on Tb9.2,
  Streamlined smart installer package creation in Symbian

8 years agowinId() for vnc and linuxfb
Jeremy Katz [Tue, 9 Feb 2010 13:46:42 +0000 (14:46 +0100)]
winId() for vnc and linuxfb

8 years agoQNAM HTTP: Forgot to remove a qDebug()
Markus Goetz [Tue, 9 Feb 2010 13:37:46 +0000 (14:37 +0100)]
QNAM HTTP: Forgot to remove a qDebug()

Reviewed-by: TrustMe
8 years agoQNAM HTTP: Reserve bytes for HTTP parsing
Markus Goetz [Tue, 9 Feb 2010 13:09:24 +0000 (14:09 +0100)]
QNAM HTTP: Reserve bytes for HTTP parsing

Reviewed-by: Peter Hartmann
8 years agoAdd platform-specific expected failures for JS test suite
Kent Hansen [Tue, 9 Feb 2010 11:29:03 +0000 (12:29 +0100)]
Add platform-specific expected failures for JS test suite

8 years agoSkip test that crashes on win32-g++
Kent Hansen [Tue, 9 Feb 2010 10:40:39 +0000 (11:40 +0100)]
Skip test that crashes on win32-g++

8 years agoQNetworkCookie(Jar): fix includes
Peter Hartmann [Tue, 9 Feb 2010 12:54:33 +0000 (13:54 +0100)]
QNetworkCookie(Jar): fix includes

we need to include the module preefix in public headers

Reviewed-by: Denis Dzyubenko
8 years agoQNAM HTTP: Improve readHeader() of the HTTP reply
Markus Goetz [Tue, 9 Feb 2010 12:30:24 +0000 (13:30 +0100)]
QNAM HTTP: Improve readHeader() of the HTTP reply

Just read() instead us using peek() and bytesAvailable()
Also don't use the obfuscated line ending checking code.

Reviewed-by: Peter Hartmann
8 years agoFix warnings ~QX11PixmapData(): QPixmap objects must be destroyed..
Friedemann Kleint [Tue, 9 Feb 2010 11:46:41 +0000 (12:46 +0100)]
Fix warnings ~QX11PixmapData(): QPixmap objects must be destroyed..
Reviewed-by: Trond Kjernåsen <trond@trolltech.com>
Task-number: QTBUG-8046

8 years agoAdd QSKIP to functionEntryAndExit_builtin.
Jedrzej Nowacki [Tue, 9 Feb 2010 11:21:44 +0000 (13:21 +0200)]
Add QSKIP to functionEntryAndExit_builtin.

The function fails on Mac and Windows, but it will be fixed in next JSC
update. Lets skip it for now.

Reviewed-by: Kent Hansen
8 years agoQNAM HTTP: Improve parseStatus() of HTTP reply
Markus Goetz [Tue, 9 Feb 2010 11:56:55 +0000 (12:56 +0100)]
QNAM HTTP: Improve parseStatus() of HTTP reply

Just read() instead us using peek() and bytesAvailable()

Reviewed-by: Peter Hartmann
8 years agoDemo browser: Better handleUnsupportedContent implementation
Markus Goetz [Tue, 9 Feb 2010 10:29:24 +0000 (11:29 +0100)]
Demo browser: Better handleUnsupportedContent implementation

Do warnings instead of downloads for sub resources.
Show error message for main resources.

Reviewed-by: Tor Arne
8 years agodemo browser: Fix the way warnings were (not) displayed
Markus Goetz [Tue, 9 Feb 2010 10:06:44 +0000 (11:06 +0100)]
demo browser: Fix the way warnings were (not) displayed

Reviewed-by: TrustMe
8 years agodoc: Updated deployment OS X requirements for 4.6
Martin Smith [Tue, 9 Feb 2010 12:13:31 +0000 (13:13 +0100)]
doc: Updated deployment OS X requirements for 4.6

Beginning with Qt 4.6, OS X 103 (Panther) is no longer supported.

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Tue, 9 Feb 2010 11:13:23 +0000 (12:13 +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:
  Improve the benchmark of QScriptClass
  QNAM HTTP: Fix issue with some servers
  Added QMake directory to INCPATH so the compiler can find required headers
  Handle Shift+Tab correctly on X11.

8 years agofix a few mistakes in German translation
Frederik Schwarzer [Tue, 9 Feb 2010 10:57:58 +0000 (11:57 +0100)]
fix a few mistakes in German translation

Merge-request: 2302
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
8 years agoSetting some parameters to reliably run on Tb9.2,
Aleksandar Sasha Babic [Tue, 9 Feb 2010 10:58:08 +0000 (11:58 +0100)]
Setting some parameters to reliably run on Tb9.2,

Tb 9.2 ATM is more memory sensitive.

Reviewed-by: TrustMe
8 years agoFix Float Conversion in xmlpatterns
Dominik Holland [Tue, 9 Feb 2010 09:58:48 +0000 (10:58 +0100)]
Fix Float Conversion in xmlpatterns

On Maemo5 devices there is an automatic conversion to Float.
So qtToXDMType() needs a special case.

Reviewed By: Peter Hartmann

8 years agoSecond attemt on rasteroverlay in blitterpaintengine
Jørgen Lind [Fri, 5 Feb 2010 11:45:09 +0000 (12:45 +0100)]
Second attemt on rasteroverlay in blitterpaintengine

8 years agoImprove the benchmark of QScriptClass
Benjamin Poulain [Tue, 9 Feb 2010 09:28:08 +0000 (10:28 +0100)]
Improve the benchmark of QScriptClass

The benchmarks has been stabilised and modified so the number
are more representative of QSCriptClass and not other part of Qt:
-the "iteration numbmer" has been introduced to ensure a minimal
number of call, indpendant of QTestLib.
-the subclasses of QScriptClass have been rewritten to have less
impact on the results

8 years agoQNAM HTTP: Fix issue with some servers
Markus Goetz [Tue, 9 Feb 2010 08:58:22 +0000 (09:58 +0100)]
QNAM HTTP: Fix issue with some servers

The call to eatWhitespace() must only be done before reading
the status, not while reading it.
(We can be in ReadingStatusState for multiple loop iterations)

Task-number: QTBUG-7673
Reviewed-by: Peter Hartmann
8 years agoStreamlined smart installer package creation in Symbian
Miikka Heikkinen [Mon, 8 Feb 2010 16:19:19 +0000 (18:19 +0200)]
Streamlined smart installer package creation in Symbian

- Added make target for creating smart installer packages
- Application sis is automatically generated if missing when
  "make installer_sis" is invoked
- No need to specify installer pkg UID if self signing is enough
- Related docs fixed
- Fixed smartinstaller.sis name to be correct

Task-number: QTBUG-8026
Reviewed-by: axis
8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Tue, 9 Feb 2010 02:37:21 +0000 (03:37 +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:
  Added QMake directory to INCPATH so the compiler can find required headers
  Handle Shift+Tab correctly on X11.

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

* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
  generate code which does not break QT_USE_FAST_CONCATENATION with old gcc
  drastically improve load time of TS files

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Mon, 8 Feb 2010 18:16:02 +0000 (19:16 +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:
  Documentation: clarified RVCT support for Symbian
  Update Symbian OS def files for 4.6.2
  Don't remove all dependencies when patching the pkg.
  Workaround for abld toolchain issue with s60main

8 years agoAdded QMake directory to INCPATH so the compiler can find required headers
Constantin Makshin [Mon, 8 Feb 2010 18:11:47 +0000 (19:11 +0100)]
Added QMake directory to INCPATH so the compiler can find required headers

Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Gareth Stockwell [Mon, 8 Feb 2010 17:35:47 +0000 (17:35 +0000)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6

8 years agoDocumentation: clarified RVCT support for Symbian
Gareth Stockwell [Mon, 8 Feb 2010 17:00:25 +0000 (17:00 +0000)]
Documentation: clarified RVCT support for Symbian

Task-number: QTBUG-8012
Reviewed-by: Iain
8 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into oslo-staging...
Denis Dzyubenko [Mon, 8 Feb 2010 16:23:00 +0000 (17:23 +0100)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into oslo-staging-1/4.6

8 years agoHandle Shift+Tab correctly on X11.
Thomas Sondergaard [Mon, 8 Feb 2010 16:19:54 +0000 (17:19 +0100)]
Handle Shift+Tab correctly on X11.

This fixes incorrect handling of Shift+Tab keysyms. Most typically
Shift+Tab generates Shift+ISO_Left_Tab, but VNC clients generate
Shift+Tab in accordance with the RFB specification.

Merge-request: 458
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Mon, 8 Feb 2010 15:27:13 +0000 (16:27 +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:
  Remove the installer from the Qt sources.
  Fixes qabstractslider autotest
  Add a recursive rule for running the auto-tests.
  Do not run the tests automatically during install.
  Fixes scrolling horizontally with a mouse wheel over sliders.
  Doc: Clarified ownership of custom buttons added to a QDialogButtonBox.
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 )
  A fix for accidently reused variable names in nested iterations.
  Iain's changes for 4.6.2
  Doc: Fixed typo.

8 years agoUpdate Symbian OS def files for 4.6.2
Shane Kearns [Mon, 8 Feb 2010 13:45:31 +0000 (14:45 +0100)]
Update Symbian OS def files for 4.6.2

Task-number: QTBUG-8024

8 years agoRemove the installer from the Qt sources.
Thiago Macieira [Mon, 8 Feb 2010 12:31:09 +0000 (13:31 +0100)]
Remove the installer from the Qt sources.

This copy of the installer doesn't work anymore.

Reviewed-By: TrustMe
8 years agoDon't remove all dependencies when patching the pkg.
Miikka Heikkinen [Mon, 8 Feb 2010 12:17:29 +0000 (14:17 +0200)]
Don't remove all dependencies when patching the pkg.

Only remove dependencies that are known to cause unncessary warnings
from pkg files when patching them with patch_capabilities.pl script.

Task-number: QTBUG-8018
Reviewed-by: Janne Koskinen
8 years agoFixes qabstractslider autotest
Denis Dzyubenko [Mon, 8 Feb 2010 10:02:02 +0000 (11:02 +0100)]
Fixes qabstractslider autotest

Fixed a bad merge in the QAbstractSlider::wheelEvent.

Modified an autotest to follow a change in behavior - scrolling with a
horizontal mouse wheel to the "right" means increasing the value.

Reviewed-by: Richard Moe Gustavsen
8 years agogenerate code which does not break QT_USE_FAST_CONCATENATION with old gcc
Oswald Buddenhagen [Mon, 8 Feb 2010 11:54:35 +0000 (12:54 +0100)]
generate code which does not break QT_USE_FAST_CONCATENATION with old gcc

8 years agodrastically improve load time of TS files
Oswald Buddenhagen [Fri, 5 Feb 2010 17:21:47 +0000 (18:21 +0100)]
drastically improve load time of TS files

it isn't such a good idea to insert rows one by one into the model.
so instead batch the "announcement" of new data.

unloading single models is still slow, but that's a corner use case, so
don't bother fixing it now, especially as it is harder to do it.

8 years agoGet rid of black flickering on resize
Paul Olav Tvete [Mon, 8 Feb 2010 11:53:15 +0000 (12:53 +0100)]
Get rid of black flickering on resize

8 years agoWorkaround for abld toolchain issue with s60main
Miikka Heikkinen [Mon, 8 Feb 2010 09:40:44 +0000 (11:40 +0200)]
Workaround for abld toolchain issue with s60main

When building for ARMV6 with abld toolchain in Symbian, qtmain.lib
ends up missing some symbols that are required to link it against
GCCE apps. This happens because --dllimport_runtime compiler
option is missing in ARMV6 builds of qtmain.lib.

Task-number: QTBUG-7952
Reviewed-by: axis
8 years agoAdd a recursive rule for running the auto-tests.
Adrian Constantin [Mon, 8 Feb 2010 10:00:03 +0000 (12:00 +0200)]
Add a recursive rule for running the auto-tests.

Use "make check" to run all the auto-tests.

Task-number: QTPROD-442
Reviewed-by: Harald Fernengel
Reviewed-by: Rohan McGovern
8 years agoDo not run the tests automatically during install.
Janne Hämäläinen [Thu, 4 Feb 2010 09:19:34 +0000 (11:19 +0200)]
Do not run the tests automatically during install.

A separate "check" rule added for running the tests. Use
"make check" to run the tests.

Task-number: QTPROD-442
Reviewed-by: Harald Fernengel
Reviewed-by: Rohan McGovern
8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Mon, 8 Feb 2010 09:38:20 +0000 (10:38 +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:
  Enabling runfast mode when vfpv2 used.
  Fixing a test case to be runnable on Symbian device.

8 years agoEnabling runfast mode when vfpv2 used.
Aleksandar Sasha Babic [Mon, 8 Feb 2010 09:31:04 +0000 (10:31 +0100)]
Enabling runfast mode when vfpv2 used.

The fpu flag is monitored and when either 'softvfp+vfpv2' or 'vfpv2'
detected we are turning on RunFast mode (via --fpumode fast switch).

Reviewed-by: Iain
8 years agoFixing a test case to be runnable on Symbian device.
Aleksandar Sasha Babic [Mon, 8 Feb 2010 09:26:37 +0000 (10:26 +0100)]
Fixing a test case to be runnable on Symbian device.

Number of stacked items had to be lowered due to memory constrains.

Reviewed-by: TrustMe
8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Mon, 8 Feb 2010 02:43:53 +0000 (03:43 +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:
  Fixes scrolling horizontally with a mouse wheel over sliders.
  Doc: Clarified ownership of custom buttons added to a QDialogButtonBox.
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 )
  A fix for accidently reused variable names in nested iterations.
  Iain's changes for 4.6.2
  Doc: Fixed typo.

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-integration
Qt Continuous Integration System [Sun, 7 Feb 2010 23:56:49 +0000 (00:56 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team:
  [CRASH] audioinput and audiooutput examples crash when no devices are

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6
Kurt Korbatits [Sun, 7 Feb 2010 23:53:17 +0000 (09:53 +1000)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6

8 years ago[CRASH] audioinput and audiooutput examples crash when no devices are
Kurt Korbatits [Sun, 7 Feb 2010 23:50:33 +0000 (09:50 +1000)]
[CRASH] audioinput and audiooutput examples crash when no devices are
available.

Task-number:QTBUG-7783
Reviewed-by:Justin McPherson

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Sat, 6 Feb 2010 05:46:11 +0000 (06:46 +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:
  Fixes scrolling horizontally with a mouse wheel over sliders.
  Doc: Clarified ownership of custom buttons added to a QDialogButtonBox.
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 )
  A fix for accidently reused variable names in nested iterations.
  Iain's changes for 4.6.2
  Doc: Fixed typo.

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Sat, 6 Feb 2010 02:46:37 +0000 (03:46 +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:
  Fixed casual crash in initializeDb (Symbian)
  Fixed a bug where text would disappear in password fields.
  Fixed sendEvent call.
  Removed useless member variable and replaced with var on the stack.
  Fixed indentation.
  Fix to S60 softkey pressed down image.
  Whitespace/tab fixes.
  s60 application loses normalGeometry when returning from fullscreen
  Fixing 'softvfp+vfpv2' compiling issue for Tb9.2

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Sat, 6 Feb 2010 00:12:05 +0000 (01:12 +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:
  Fixes scrolling horizontally with a mouse wheel over sliders.
  Doc: Clarified ownership of custom buttons added to a QDialogButtonBox.
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 )
  A fix for accidently reused variable names in nested iterations.
  Iain's changes for 4.6.2
  Doc: Fixed typo.

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, 5 Feb 2010 21:28:41 +0000 (22:28 +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: (49 commits)
  Fixed qt_x11_wait_for_window_manager
  Revert change 34f1758 on non-Synbian platforms
  Fixed QGifHandler::loopCount().
  Fix tst_QAccessiblity failure.
  fix compile error when linuxinput keyboard driver is compiled as plugin
  Fixed the context menu test case in the qgraphicsscene autotest.
  fix regression from Qt 4.5 wrt missing text pixels in QTabBar
  Cleanup after "Changed qgraphicswidget autotest to use qWaitForWindowShown"
  Cleanup after "QGraphicsWidget is painted twice on the first show"
  Changed qgraphicswidget autotest to use qWaitForWindowShown.
  Improved QTest::qWaitForWindowShown on X11.
  Stabilize tst_QGraphicsWidget::initialShow2 (new test)
  Make sure we define S_IFDIR on Windows
  Fix copy/pasto
  Crash when closing any top-level widget on Symbian.
  Cache the sizes of the images in an animated GIF.
  Fix the QAbstractSlider autotest.
  Use OpenVG scissor on 90/180/270 rotations and simple clips.
  Optimize single-rect IntersectClip in OpenVG using the scissor
  QGraphicsWidget is painted twice on the first show.
  ...

8 years agoFixed casual crash in initializeDb (Symbian)
Alessandro Portale [Fri, 5 Feb 2010 20:31:10 +0000 (21:31 +0100)]
Fixed casual crash in initializeDb (Symbian)

dynamic_cast should be used carefully with rvct before version 4.

We found that out after the a dynamic (down)-cast from CFont* to
CFbsFont* in QtGui suddenly failed.

We test for (TypeUid() == KCFbsFontUid), before doing the
cast. So, a static_cast is safe in this case. Also the other
two dynamic_casts in qfontdatabase_s60.cpp were changed to
static_cast.

http://bugreports.qt.nokia.com/browse/QTBUG-7963

Task-number: QTBUG-7963
Reviewed-by: lars
modified:   src/gui/text/qfontdatabase_s60.cpp

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
Qt Continuous Integration System [Fri, 5 Feb 2010 18:40:44 +0000 (19:40 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
  don't use QKeySequence::mnemonic() after all
  don't use stylesheet for just making labels bold
  remove the rounded extra frame around the main message editor
  add const

8 years agoFixes scrolling horizontally with a mouse wheel over sliders.
Denis Dzyubenko [Tue, 2 Feb 2010 15:12:34 +0000 (16:12 +0100)]
Fixes scrolling horizontally with a mouse wheel over sliders.

When scrolling horizontally over sliders the slider should go to the right,
which means the value of the slider should increase. However in Qt scrolling
with a mouse wheel horizontally means the delta value is negative, which is
wrong. So changed the delta to be inversed.

Reviewed-by: Richard Moe Gustavsen
8 years agodon't use QKeySequence::mnemonic() after all
Oswald Buddenhagen [Fri, 5 Feb 2010 15:27:19 +0000 (16:27 +0100)]
don't use QKeySequence::mnemonic() after all

it wastes cpu cycles, and it started flooding the console with
irrelevant messages.

8 years agoFixed qt_x11_wait_for_window_manager
Denis Dzyubenko [Fri, 5 Feb 2010 15:59:33 +0000 (16:59 +0100)]
Fixed qt_x11_wait_for_window_manager

When we wait for the window to be shown by looking for ReparentNotify,
MapNotify, etc events in the event queue, we should check if those events come
for the right window, otherwise we might exit too early if there are event for
an other window in the queue.

Reviewed-by: Leonardo Sobral Cunha
8 years agoRevert change 34f1758 on non-Synbian platforms
Paul Olav Tvete [Fri, 5 Feb 2010 15:44:51 +0000 (16:44 +0100)]
Revert change 34f1758 on non-Synbian platforms

The change introduces behavior changes (including crashing on QWS).
It is only critical for Symbian. To reduce risk, we only apply it
on the Symbian platform for now.

Task-number: Autotest regression
Reviewed-by: Jesper
8 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
David Boddie [Fri, 5 Feb 2010 15:17:53 +0000 (16:17 +0100)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6

8 years agoFixed QGifHandler::loopCount().
Trond Kjernåsen [Fri, 5 Feb 2010 15:06:33 +0000 (16:06 +0100)]
Fixed QGifHandler::loopCount().

Task-number: QTBUG-7037
Reviewed-by: Kim
8 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
David Boddie [Fri, 5 Feb 2010 15:02:30 +0000 (16:02 +0100)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6

8 years agoDoc: Clarified ownership of custom buttons added to a QDialogButtonBox.
David Boddie [Fri, 5 Feb 2010 15:01:29 +0000 (16:01 +0100)]
Doc: Clarified ownership of custom buttons added to a QDialogButtonBox.

Reviewed-by: Trust Me
Suggested-by: Robert Griebl
8 years agoUpdated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96...
Simon Hausmann [Fri, 5 Feb 2010 14:58:26 +0000 (15:58 +0100)]
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( da5d96a26e80162027bc95ce7e5725fe4b277ff7 )

Changes in WebKit/qt since the last update:

8 years agodon't use stylesheet for just making labels bold
Oswald Buddenhagen [Fri, 5 Feb 2010 13:35:55 +0000 (14:35 +0100)]
don't use stylesheet for just making labels bold

8 years agoremove the rounded extra frame around the main message editor
Oswald Buddenhagen [Fri, 5 Feb 2010 13:32:10 +0000 (14:32 +0100)]
remove the rounded extra frame around the main message editor

for one, it just added visual noise.
second, it did not respect the color scheme, which made it unusable with
light-on-dark colors.

Task-number: QTBUG-7778

8 years agoadd const
Oswald Buddenhagen [Fri, 5 Feb 2010 13:30:49 +0000 (14:30 +0100)]
add const

Reviewed-by: hjk
8 years agoMerge remote branch 'origin/4.6' into 4.6
Paul Olav Tvete [Fri, 5 Feb 2010 13:23:54 +0000 (14:23 +0100)]
Merge remote branch 'origin/4.6' into 4.6

Conflicts:
dist/changes-4.6.2

8 years agoMerge branch 'inputContextFixes' into 4.6-s60
axis [Fri, 5 Feb 2010 13:14:25 +0000 (14:14 +0100)]
Merge branch 'inputContextFixes' into 4.6-s60

8 years agoFix tst_QAccessiblity failure.
Bjørn Erik Nilsen [Fri, 5 Feb 2010 12:59:16 +0000 (13:59 +0100)]
Fix tst_QAccessiblity failure.

This started to fail after 34f1758428282a327c12b0d8040061c1f67ecc7f.
Or actually, the test crashes on my machine. Reason is that the the test
first creates a top-level line edit (which then gets its own backing
store). The line edit is then reparented into another top-level. When
the line edit is destroyed extra->topextra->backingStore is true and we
delete the backing store it first got when created as a top-level.
However, the line edit was reparented so this backing store is not the
"active" one. We should still delete topextra->backingstore, but we must
also remove any pointer references to the line edit in the "active" backing
store.

Reviewed-by: jbarron
8 years agoFixed a bug where text would disappear in password fields.
axis [Fri, 5 Feb 2010 12:53:12 +0000 (13:53 +0100)]
Fixed a bug where text would disappear in password fields.

There were two bugs:

- First, we need to avoid triggering the CancelTransaction call when
  committing the temporary preedit text, because otherwise FEP starts
  sending us spurious backspace events. Since the
  "triggeredBySymbian" variable is no longer descriptive for that use
  case, I renamed it in the process and that changed the negation of
  the flag. Notice the absense of a change inside
  commitTemporaryPreeditString(). That is because we want that one
  to avoid the transaction cancel, and therefore wee keep the old
  negation.

- Second, m_cursorPos needs to be kept in sync with the widget state
  when we send the temporary preedit string, because the input
  context cannot separate between types of preedit text when it hits
  the first block in commitCurrentString() (types being either our
  temporary text, or FEP's text), and we have to avoid the longPress
  code path.

RevBy:    Janne Koskinen

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, 5 Feb 2010 13:05:02 +0000 (14:05 +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:
  Fix to S60 softkey pressed down image.
  Whitespace/tab fixes.
  s60 application loses normalGeometry when returning from fullscreen
  Fixing 'softvfp+vfpv2' compiling issue for Tb9.2

8 years agofix compile error when linuxinput keyboard driver is compiled as plugin
Rainer Keller [Thu, 21 Jan 2010 16:27:27 +0000 (17:27 +0100)]
fix compile error when linuxinput keyboard driver is compiled as plugin

When creating the driver instance two parameters are given to the
driver. But it accepts only the name of the device to be used.

Reviewed-by: Paul
Merge-request: 2288

8 years agoFixed sendEvent call.
axis [Fri, 5 Feb 2010 12:51:28 +0000 (13:51 +0100)]
Fixed sendEvent call.

The documentation states we should use the local sendEvent. Not sure
if it makes a difference, but better to be consistent.

RevBy:    Trust me

8 years agoRemoved useless member variable and replaced with var on the stack.
axis [Fri, 5 Feb 2010 12:49:46 +0000 (13:49 +0100)]
Removed useless member variable and replaced with var on the stack.

RevBy:    Trust me