profile/ivi/qtbase.git
11 years agoTest: remove QSKIP from tst_qstextstream
Caroline Chao [Tue, 16 Oct 2012 10:43:08 +0000 (12:43 +0200)]
Test: remove QSKIP from tst_qstextstream

Instead omit the whole tests when Q_OS_WINCE is defined.

Change-Id: Idb15d622c9e1dbe4c8ec6a43c34a88e7fef2a384
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
11 years agoTest: remove QSKIP from tst_QProcessEnvironment::putenv
Caroline Chao [Tue, 16 Oct 2012 10:59:06 +0000 (12:59 +0200)]
Test: remove QSKIP from tst_QProcessEnvironment::putenv

Instead omit the whole test when Q_OS_WINCE is defined.

Change-Id: I19e35b837709c92e0202c6a96d113367bc6c92c2
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
11 years agoUse organization name "QtProject" in examples.
Friedemann Kleint [Tue, 16 Oct 2012 08:23:43 +0000 (10:23 +0200)]
Use organization name "QtProject" in examples.

Change-Id: Ibbe9517ccf81d25eccbdff98f7cfe8ff6ec485d2
Reviewed-by: hjk <qthjk@ovi.com>
11 years agoCheck if there is an old item before removing it
Andy Shaw [Wed, 10 Oct 2012 09:23:31 +0000 (11:23 +0200)]
Check if there is an old item before removing it

If something had changed with the menu item before it had actually been
originally added to the native menu then this would crash when trying
to remove a null item from the native menu.  This prevents that from
happening.

Change-Id: I8d78b5504759225364d5fd051a23c8d6dbd7d1eb
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoCocoa: Set platform window geometry correctly.
Morten Johan Sorvig [Tue, 16 Oct 2012 12:00:50 +0000 (14:00 +0200)]
Cocoa: Set platform window geometry correctly.

Handle the non-toplevel child window case, where
QWindow has a parent NSView instead of a parent
NSWindow. QWindow geometry is  then equivalent to
the frame geometry

Task-number: QTBUG-26972

Change-Id: Ie7cedb3ec1a564ce55b72e8269d4853962e073ce
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
11 years agoCocoa: use defaultPixmap() if pixmap is not set for drag
Teemu Katajisto [Tue, 16 Oct 2012 09:06:14 +0000 (12:06 +0300)]
Cocoa: use defaultPixmap() if pixmap is not set for drag

Task-number: QTBUG-26971

Change-Id: I6aed56a6b292c5aeebf38278d2a1fa982346c909
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoLogging: Mark deprecated API with QT_DEPRECATED
Kai Koehne [Tue, 18 Sep 2012 07:57:51 +0000 (09:57 +0200)]
Logging: Mark deprecated API with QT_DEPRECATED

Still use it in qtestlib though because using qInstallMessageHandler
here would break all tests (still) using qInstallMsgHandler - Qt always
uses the new message handler if there's one, ignoring any message handler
installed through deprecated API.

Change-Id: I6fefefb315a2421425d2b7787e367fd348a33d83
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoRemove unneded forward declaration.
Frederik Gladhorn [Tue, 2 Oct 2012 13:40:48 +0000 (15:40 +0200)]
Remove unneded forward declaration.

Change-Id: I19157bde9a7b5ac3eb54830841baea08c8af8670
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
11 years agoQML plugins: Make sure that both debug and release versions are built
Kai Koehne [Tue, 16 Oct 2012 09:51:29 +0000 (11:51 +0200)]
QML plugins: Make sure that both debug and release versions are built

Make sure that both debug and release versions of QML plugins are built
if Qt is configured accordingly. Also pass on the other QT_CONFIG configurations.

Change-Id: I4aaaf002068dd66277235bef7d1e3da3366d6d12
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoFix function names in warning messages.
Frederik Gladhorn [Fri, 28 Sep 2012 18:06:51 +0000 (20:06 +0200)]
Fix function names in warning messages.

Change-Id: I14abc176ea670799496e10bee296b4e84fdc7181
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
11 years agoFix setting custom cursor for widgets and windows before showing them
Miikka Heikkinen [Mon, 15 Oct 2012 11:17:01 +0000 (14:17 +0300)]
Fix setting custom cursor for widgets and windows before showing them

If custom cursor was set before the window was created, it didn't
actually get set, and in some cases even caused a crash.
Fixed by making sure the cursor is correct when showing widget/window.

Task-number: QTBUG-27535
Change-Id: I3bc946a9c406c96af5b86869a3a54893f8980aba
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoFix compile errors in configure.exe.
Jason Barron [Mon, 15 Oct 2012 20:13:58 +0000 (22:13 +0200)]
Fix compile errors in configure.exe.

qstringmatcher.cpp and qchar.cpp are included in qstring.cpp and
qunicodetables.cpp is included in qchar.cpp so these files should
not be compiled as standalone objects.

Change-Id: I323e0878af28b9e5fb2f659fb8077347b93fa439
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoQPA: Introducing QPlatformTheme standardPixmap(), fileIconPixmap()
Gabriel de Dietrich [Wed, 10 Oct 2012 11:58:19 +0000 (13:58 +0200)]
QPA: Introducing QPlatformTheme standardPixmap(), fileIconPixmap()

The basic idea is that the platform theme is now responsible for
providing the pixmaps for the given standard name, or any file or
directory. Then, the QStyle implementation should query the platform
theme for the pixmaps, and build the icons accordingly using
ThemeHint::IconPixmapSizes. Same thing for QFileIconProvider. This
also opens future support for getting platform dependent pixmaps in
QtQuick components.

Also includes the implementation for the Cocoa (QCocoaTheme) and
Windows (QWindowsTheme) platform plugins.

Task-number: QTBUG-27450
Change-Id: I4e8406585d970a9af481be10f6643cf0abbc38a3
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoRemove QImageReader benchmark dependency on QtWidgets.
Stephen Kelly [Tue, 16 Oct 2012 09:43:53 +0000 (11:43 +0200)]
Remove QImageReader benchmark dependency on QtWidgets.

The QLabel is not actually used.

Change-Id: Ia3f43b734fa52ad002111943ed1ba55b9e8a678c
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
11 years agoAdd HasFrame feature to QStyleOptionTab
Jens Bache-Wiig [Tue, 16 Oct 2012 07:02:08 +0000 (09:02 +0200)]
Add HasFrame feature to QStyleOptionTab

This makes it possible for styles like Fusion to draw tabbars different
when they have a frame.

Change-Id: I1bb21198c0c3caf44c757f6f39310bf2509054bf
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
11 years agoIntroduce (private) QStyleAnimation
J-P Nurmi [Fri, 5 Oct 2012 08:42:10 +0000 (10:42 +0200)]
Introduce (private) QStyleAnimation

QStyleAnimation handles style animations in a generic fashion by
sending StyleAnimationUpdate events back to the animation target
instead of calling QWidget::update() directly. This decouples style
animations from widgets and makes it possible to run style animations
for QQuickItems (ie. the desktop components).

The next step is to add "QObject* QStyleOption::target" and use that
everywhere instead of the widget pointer passed to various QStyle
methods.

Change-Id: Ib963c54872805fc3f0123ff922f82c9962a68b90
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
11 years agoQComboBox: replace homebrew with QSignalSpy for editTextChanged test
Mark Brand [Mon, 15 Oct 2012 23:46:44 +0000 (01:46 +0200)]
QComboBox: replace homebrew with QSignalSpy for editTextChanged test

Change-Id: Id4c81ae71d6dc87f9ad7cfb99a89d335162e1f75
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
11 years agoAdd documentation for ucs4 overloads.
Frederik Gladhorn [Tue, 16 Oct 2012 11:05:42 +0000 (13:05 +0200)]
Add documentation for ucs4 overloads.

Change-Id: Ibacd8f260950db195a17cffe8396e8460f227eb9
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
11 years agoWindows: Document WinAPI usage for the various compilers.
Friedemann Kleint [Mon, 15 Oct 2012 14:19:02 +0000 (16:19 +0200)]
Windows: Document WinAPI usage for the various compilers.

Change-Id: I139c6546cb84a1fa93920a501cd15eb11fdadbb8
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
11 years agoReview of documentation.
Michele Caini [Thu, 11 Oct 2012 21:19:50 +0000 (23:19 +0200)]
Review of documentation.

Documentation has been updated, changes apply to Qt5 as well as Qt4.

Change-Id: I692869971bafffabbb9c323dc031f6d984c1adb9
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
11 years agoFix QComboBox icon testing
Giuseppe D'Angelo [Sat, 13 Oct 2012 18:15:17 +0000 (19:15 +0100)]
Fix QComboBox icon testing

The icons used were always null -- the files used to create them were
not present. So

1) add back the files used for the test (qtlogo.png,
copied from src/widgets/dialogs/images/qtlogo-64.png, and qtlogoinverted.png,
its copy rotated by 180°);

2) use QFINDTESTDATA to get the paths to the files.

Change-Id: I26f094079e037116e49e2a95345c2dea7496eecb
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
11 years agoExclude a QCOMPARE in tst_QListWidget instead of excluding the whole class.
Stephen Kelly [Tue, 9 Oct 2012 14:24:52 +0000 (16:24 +0200)]
Exclude a QCOMPARE in tst_QListWidget instead of excluding the whole class.

The original bug was reported as a different test failing. Looking
through the CI logs, that test now always passes, but fastScroll fails
unstably. The fastScroll test is already excluded on Mac, but the patch and
reason for that predates the public git history.

This is a regression since marking the entire test as insignificant,
and shows why insignification of tests should be as narrow as possible.

Narrow this one now.

Task-number: QTBUG-21098
Change-Id: I0d6c22e422af190c9e6331e123db38022af28e4b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
11 years agoUse the mkspec name Qt was configured with instead of default symlink
Stephen Kelly [Mon, 15 Oct 2012 15:15:41 +0000 (17:15 +0200)]
Use the mkspec name Qt was configured with instead of default symlink

The default symlink is not available on Windows, so the qplatformdefs.h
header is not available there. Instead we can bypass the symlink and
use the actual mkspec name directly.

Change-Id: I1d7e05f35c1ff56befab5bed307cb1755ade8377
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoQScreen's physicalSize can change. Ensure siblings are updated.
Shawn Rutledge [Thu, 4 Oct 2012 13:47:02 +0000 (15:47 +0200)]
QScreen's physicalSize can change.  Ensure siblings are updated.

I have found the following scenarios when the physical size can
appear to change even though you can't actually stretch your monitor:
1) VNC allows setting the resolution.  Physical size will then be a
fraction of the physical size of the monitor on which you display the
VNC window.
2) When you rotate your display, the width and height are reversed.
3) MacOS X simulates a change in physical size when you change the
mode to one whose aspect ratio does not match your monitor, and also
when you use simulated HiDPI mode on a non-HiDPI monitor.  While this
info is basically wrong, since we are now querying the OS for it, we
might as well make sure it is propagated all the way through to the
QScreen object's properties.

Also, make sure that when geometry changes on one screen, all the
siblings are informed of the change in virtual geometry.  Also
simplified the signals (don't need separate ones to inform of
changes which are fundamentally related to each other and always
change together).

Change-Id: I6a98a1c203e24e8fbeef6e90999671e56dc0c655
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoWindows QScreen: handle change in working area when the taskbar moves
Shawn Rutledge [Wed, 19 Sep 2012 16:06:12 +0000 (18:06 +0200)]
Windows QScreen: handle change in working area when the taskbar moves

Change-Id: Ic496419d89b9cca7653e77ef22978597abcb4e30
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoMark tst_networkselftest as an insignificant.
Janne Anttila [Mon, 15 Oct 2012 12:24:20 +0000 (15:24 +0300)]
Mark tst_networkselftest as an insignificant.

The ftpProxyServer test case is failing constantly in Digia hosted
Qt-Project CI system, especially on Windows machines. Because this
failing autotest is blocking the use of Digia hosted CI system,
it is marked as an insignificant for now.

There is a bug report QTBUG-27571 created to fix the problem.

Change-Id: I196ad76823874dbc85b1f5abbaf020e02b3c410e
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
11 years agoGet rid of unused member
Konstantin Ritt [Sat, 13 Oct 2012 22:50:16 +0000 (01:50 +0300)]
Get rid of unused member

Change-Id: Ic6d207cacf02f2e6837f9f35020be7728ec60706
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoQTextBlock: Handle surrogates in textDirection()
Konstantin Ritt [Sun, 14 Oct 2012 22:37:03 +0000 (01:37 +0300)]
QTextBlock: Handle surrogates in textDirection()

just like QString does.

Change-Id: I002827d9ec93fb19ef2c0198b5fcd4dae15c5c34
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoQFont: Don't detach unless value has really changed
Konstantin Ritt [Thu, 11 Oct 2012 16:47:58 +0000 (19:47 +0300)]
QFont: Don't detach unless value has really changed

Change-Id: I496b0102853d04652322bf8751e5824aaa0725b7
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoEnsure QOPENGLF_APIENTRY and QGLF_APIENTRY are set correctly.
Jason Barron [Mon, 15 Oct 2012 11:28:29 +0000 (13:28 +0200)]
Ensure QOPENGLF_APIENTRY and QGLF_APIENTRY are set correctly.

gl2ext.h only defines GL_APIENTRY and not APIENTRY so we should use
this macro if it is available. Without it, code that uses
QOPENGLF_APIENTRY and QGLF_APIENTRY might experience compile errors
due to the differing signatures.

Task-number: QTBUG-27313
Change-Id: Id79d934825928d9913138edc6e8f1b00edc89a8d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoGet rid of QT_MODULE_DOC_BASE/QT.foo.docs
Tor Arne Vestbø [Mon, 15 Oct 2012 15:51:51 +0000 (17:51 +0200)]
Get rid of QT_MODULE_DOC_BASE/QT.foo.docs

It was only needed by qt_module.pri anyways, to handle index lookup
paths for qdoc when building documentation that depends on other modules.

Change-Id: Ibf60e2504f388b1aed7231eee04d89d3ba31c6eb
Hand-held-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoRemove an old workaround in QKeySequence.
Jędrzej Nowacki [Thu, 11 Oct 2012 08:51:44 +0000 (10:51 +0200)]
Remove an old workaround in QKeySequence.

The workaround is not needed anymore. QMetaType is smart enough to use
dummy functions for types that are not active (switched off by QT_NO_
macros).

It also moves forward Qt build with -qconfig=minimal.

Change-Id: I8308ac8342917a2e32d70836902522e93f2b5014
Reviewed-by: Jing Bai <jing.bai@digia.com>
11 years agoremove apparently dead CONFIG+=dylib
Oswald Buddenhagen [Fri, 21 Sep 2012 19:38:10 +0000 (21:38 +0200)]
remove apparently dead CONFIG+=dylib

Change-Id: Ib7d1739e6a283bb93179345adb9470ac1f064ec8
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoqfeatures.txt: add LOCALSERVER (requires TEMPORARYFILE)
J-P Nurmi [Fri, 12 Oct 2012 19:42:00 +0000 (21:42 +0200)]
qfeatures.txt: add LOCALSERVER (requires TEMPORARYFILE)

Change-Id: I5b03fee3ceceade1fc0f4e3162eac339b1d147f3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoRevert a change to printer orientation
Titta Heikkala [Thu, 6 Sep 2012 09:58:18 +0000 (12:58 +0300)]
Revert a change to printer orientation

Reverting change: Ia6bc9ae14d79a646e61bfc97652f9f5af90738b3
The previous change does not set the printer correctly. It looks
based on the tests that the correct printer is set, but in reality
the default printer is used (even though printerName() is returning
the printer set).

Updated taskQTBUG4497_reusePrinterOnDifferentFiles() test case
so that it generates PDF instead of PS. Testing the binary output
can't be guaranteed to work in this case.

Change-Id: Iee111f2c2dec84f86344a38816c21e191f5373ea
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
11 years agoCocoa: Speed up fading out scroll bars.
Christoph Schleifenbaum [Mon, 8 Oct 2012 15:39:29 +0000 (17:39 +0200)]
Cocoa: Speed up fading out scroll bars.

This patch replaces QDateTime usage with msecs since epoch to calculate
scroll bars opacity. This eliminates lots of QDateTime::msecsTo calls.

Change-Id: Ic0c26806660c192c5fc6de0dafd86b4200e3cb4c
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoQDockWidget: Enable framestrut events when undocked by doubleclick.
Friedemann Kleint [Mon, 15 Oct 2012 10:59:07 +0000 (12:59 +0200)]
QDockWidget: Enable framestrut events when undocked by doubleclick.

Task-number: QTBUG-26296

Change-Id: I2821a99add238d2a2cb5b6788d689a48e050e74a
Reviewed-by: Markku Tapio Heikkilä <markku.heikkila@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoAdd cglContextForContext to QCocoaNativeInterface.
Zeno Albisser [Fri, 12 Oct 2012 14:33:40 +0000 (16:33 +0200)]
Add cglContextForContext to QCocoaNativeInterface.

This change enables receiving the native CGLContextObj that is used
by a QOpenGLContext. This clearly is non-public api that is only meant to
be used as a last resort for cases where it is really necessary to
get hold of a native context object.

Change-Id: Id00efc88a73d7df04a68c022f19d9d1c4f6d386b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoMake QFileDialogs more accessible.
Frederik Gladhorn [Fri, 12 Oct 2012 10:00:07 +0000 (12:00 +0200)]
Make QFileDialogs more accessible.

Update the file dialog's ui file.
Add accessible name and description to the list views.
Fix the tabbing order to be more logical.

Change-Id: Ib71214e1f2aef4f9c9bfa747ba5a8c452b18fa22
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
11 years agoImprove Qt::WA_UnderMouse accuracy
Miikka Heikkinen [Fri, 12 Oct 2012 12:28:55 +0000 (15:28 +0300)]
Improve Qt::WA_UnderMouse accuracy

Qt::WA_UnderMouse is set/cleared when widgets get enter/leave events.
When there is a popup active, Qt::WA_UnderMouse should always report
false, but this was not happening, because existing state was not
cleared when popup was opened.

Dispatch a leave event for last mouse receiver when a popup is
opened to update the Qt::WA_UnderMouse state. This is roughly
equivalent to what happens on Qt4.

Task-number: QTBUG-27478
Change-Id: I7739e75727213e748ab2f42f1027d32325d89fb0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
11 years agotst_qfile: remove QSKIP's -> omit whole test cases instead
Sergey Hambardzumyan [Wed, 5 Sep 2012 08:50:23 +0000 (10:50 +0200)]
tst_qfile: remove QSKIP's -> omit whole test cases instead

Change-Id: Ibc01790992e839e3afde4b52682cb155c7f3f5f8
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
11 years agoUse QLatin1String in AtSpiAdaptor::applicationInterface
José Millán Soto [Mon, 15 Oct 2012 12:10:56 +0000 (14:10 +0200)]
Use QLatin1String in AtSpiAdaptor::applicationInterface

Using QLatin1String in string constants which were not using it.

Change-Id: I3aa4b7104cf3d1765874e0ee9a6fd23aadd8d671
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
11 years agoFix spelling mistake in QNetworkDiskCache detailed description.
Mitch Curtis [Mon, 15 Oct 2012 11:00:43 +0000 (13:00 +0200)]
Fix spelling mistake in QNetworkDiskCache detailed description.

Task-number: QTBUG-27291
Change-Id: I620d258a08d670fa27d60575e32f1767525f3ed9
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoRemove documentation for non-existent QToolBar functions.
Mitch Curtis [Wed, 12 Sep 2012 14:22:09 +0000 (16:22 +0200)]
Remove documentation for non-existent QToolBar functions.

Change-Id: I8b5861937ff8f75e0a4b69b30069fa1026ff1075
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoAdapt to WebKit Widgets module changes
Simon Hausmann [Mon, 15 Oct 2012 13:19:43 +0000 (15:19 +0200)]
Adapt to WebKit Widgets module changes

QtWebKit is being split up into QtWebKit and QtWebKitWidgets. QWebView
and QGraphicsWebView live in the QtWebKitWidgets module and consequently
the class list here in UIC needs to be adapted.

Change-Id: I245dba49d4fb23ca197f78de4a429b8ba9f78c3f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoQtSql: Correct documented default precision policy.
Mark Brand [Sat, 13 Oct 2012 21:10:27 +0000 (23:10 +0200)]
QtSql: Correct documented default precision policy.

Follow-up to commit c9f77564df14f91276e9ca693a9b3f339dab9334
Task-number: QTBUG-27482

Change-Id: I17c12ee14d4609bccbe67bba2581f13d72c069ae
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
11 years agoQRawFont: improve performance and safety of glyphIndexesForString()
Konstantin Ritt [Thu, 11 Oct 2012 13:19:34 +0000 (16:19 +0300)]
QRawFont: improve performance and safety of glyphIndexesForString()

As of 98c1eb1750498cdff9d3b26658e5e5be9c026c92, partially initialized
QGlyphLayout is ok for stringToCMap() if GlyphIndicesOnly flag is set,
thus we can use the glyphIndexes buffer directly and avoid copying.
Also add some checks to guarantee we're not falling into an undefined behavior
for the empty text or NULL buffer.

Change-Id: I662953703e4c65edbebabbe4b753972417d963f3
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoChange copyrights from Nokia to Digia
Sergio Ahumada [Sun, 14 Oct 2012 15:31:24 +0000 (17:31 +0200)]
Change copyrights from Nokia to Digia

Change copyrights and license headers from Nokia to Digia

Change-Id: I66d941a5fa7ed8046a3498686432450018a8dfaa
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoQThread signals documentation improvement
Olivier Goffart [Wed, 10 Oct 2012 15:28:42 +0000 (17:28 +0200)]
QThread signals documentation improvement

Be more explicit on from which thread the signals are emitted, and
mention that it is possible to connect finished with deleteLater

Change-Id: Ib72be94a81be383774f08d71915fa609843030e0
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agocorrect spelling in QtSql documentation
Mark Brand [Sat, 13 Oct 2012 21:09:34 +0000 (23:09 +0200)]
correct spelling in QtSql documentation

Change-Id: I69e4178bbe967a70b1141122639883b5cbacd924
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
11 years agoQComboBox::currentText: correct documentation
Mark Brand [Sat, 13 Oct 2012 11:38:34 +0000 (13:38 +0200)]
QComboBox::currentText: correct documentation

The documentation previously neglected the fact that the current text
can be provided by the embedded QLineEdit if the combo box is editable
even if there is no selected item.

Change-Id: If40868c1633af7ce81b437d29e1da3fd4fefafb0
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Adam Light <aclight@gmail.com>
Reviewed-by: David Faure <david.faure@kdab.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
11 years agoDefine QMAKE_LIBS_OPENGL_ES2 for win32-g++ mkspec.
Jason Barron [Tue, 2 Oct 2012 07:38:55 +0000 (09:38 +0200)]
Define QMAKE_LIBS_OPENGL_ES2 for win32-g++ mkspec.

Needed to compile Qt with ANGLE.

Change-Id: Ie88aeff21dfeddbfcb6ef14e453c8dc077896a1b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoQKeySequence: remove duplicate QDataStream operators
J-P Nurmi [Fri, 12 Oct 2012 08:22:57 +0000 (10:22 +0200)]
QKeySequence: remove duplicate QDataStream operators

The operators are implemented in qkeysequence.cpp

Change-Id: Id3078abe944673dd2076cc642e4474caa1472dcc
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
11 years agoQPlatformWindow: change API for QPlatformWindow::setWindowFlags
Richard Moe Gustavsen [Tue, 9 Oct 2012 08:52:44 +0000 (10:52 +0200)]
QPlatformWindow: change API for QPlatformWindow::setWindowFlags

The current implementation requests the platform window to set
as many of the flags it can, and return the same flags with the
unsupported flags removed.

The problem with this approach is that the platform window is created
as late as possible, so a call to QWindow::setWindowFlags would in
many (most?) cases never be forwarded to the platform window (instead,
the platform window is responsible to check the current window flags
upon creation). As such, the filtering would never be done.
Looking at the current set of plugins, most of them also seems to
ignore this protocol, returning the flags unfiltered.

This patch suggests removing the return value from
QPlatformWindow::setWindowFlags. This will at least be consistent, so
that setting/getting flags would produce the same result independent of
delayed window creation. If needed, we can later add new API to
QPlatformIntegration or QPlatformWindow for querying supported window
flags.

Change-Id: I9c759b5f9fab5ebed764a982f77fe19881118875
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
11 years agoChange copyrights from Nokia to Digia
Sergio Ahumada [Sun, 14 Oct 2012 15:05:41 +0000 (17:05 +0200)]
Change copyrights from Nokia to Digia

Change copyrights and license headers from Nokia to Digia

Change-Id: Ia683171b30b5bf7cedb56cc3087b4b68644a3da1
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoRe-revert "Delay creation of the process manager"
Thiago Macieira [Tue, 18 Sep 2012 11:54:35 +0000 (13:54 +0200)]
Re-revert "Delay creation of the process manager"

This reverts commit daba2c507ad42c66dafa6a29cffa94e9641e0c58,
re-applying commit d9c06bf25210b3d0b31ee6126e57bcb82c292da1, because
the change was accidentally brought back in commit
eae8fb85997d82ecec0743ba3e470681129bff41.

There's a potential deadlock when a QProcess is created while a
QCoreApplication is instantiated but never executed, or if the main
thread waits() for the child thread.

Task-number: QTBUG-27260
Change-Id: I9e0fdc0341b3063de90979377bac35f2a827b260
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agomoc: parse properly the gcc extension for variadic macro
Olivier Goffart [Fri, 12 Oct 2012 11:37:21 +0000 (13:37 +0200)]
moc: parse properly the gcc extension for variadic macro

Task-number: QTBUG-27547

Change-Id: I983b96b09c405e5330327092e56164b9921a2d0f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoQCommonStyle: Reduce code duplication
Konstantin Ritt [Tue, 9 Oct 2012 13:18:49 +0000 (16:18 +0300)]
QCommonStyle: Reduce code duplication

by re-using viewItemTextLayout() helper function.
Also use QTextLayout(QString, QFont) c-tor which is a bit faster than
using setText() + setFont() setters.

Change-Id: I0d09ba43bad2296e932f49fcb9cfd28f42c1f95d
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
11 years agoQSqlTableModel: let select() and selectRow() be slots
Mark Brand [Sat, 13 Oct 2012 11:07:38 +0000 (13:07 +0200)]
QSqlTableModel: let select() and selectRow() be slots

It's convenient to be able to connect a button to select()
and signals that provide a row to selectRow().

Change-Id: I520d5564943f679ec9e68331878a211dd52b4a06
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: David Faure <david.faure@kdab.com>
11 years agoQNX: code cleanup, use '0' instead of 'NULL'
Rafael Roquetto [Sat, 13 Oct 2012 19:12:28 +0000 (16:12 -0300)]
QNX: code cleanup, use '0' instead of 'NULL'

Qt coding style uses always 0. NULL is wrong.

Change-Id: I163677b512214f853677d21d75f13142fe2ca88d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
11 years agoandroid: set QMAKE_COMPILER
Arvid Picciani [Thu, 11 Oct 2012 15:16:04 +0000 (15:16 +0000)]
android: set QMAKE_COMPILER

Change-Id: I5b38bf94f0f0d4080b8d355013441c1805524d71
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoandroid-qt: fix build for jellybean
Arvid Picciani [Wed, 10 Oct 2012 14:13:42 +0000 (14:13 +0000)]
android-qt: fix build for jellybean

Change-Id: I2a52770502ec6e70ae0e3928d98c6c573f773579
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoandroid-eglfs: open the correct fb device for reading attrs
Arvid Picciani [Wed, 10 Oct 2012 14:11:30 +0000 (14:11 +0000)]
android-eglfs: open the correct fb device for reading attrs

Change-Id: Icedcab50379834fa3456d0e18aaef8a4dd9cf949
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoDo not skip tst_QClipboard::copy_exit_paste on QNX
Rafael Roquetto [Wed, 10 Oct 2012 17:29:10 +0000 (14:29 -0300)]
Do not skip tst_QClipboard::copy_exit_paste on QNX

This test is valid on QNX platforms.

Change-Id: Ic9657c2b92628a649ab52367135dcb3a77450913
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoqdoc outputs warnings in a form which Creator will recognize
Shawn Rutledge [Mon, 24 Sep 2012 13:25:15 +0000 (15:25 +0200)]
qdoc outputs warnings in a form which Creator will recognize

Recently Creator started recognzing the warnings from qdoc, however because
warnings are not labeleled with " warning: ", there is no yellow-triangle
symbol in the Issues list.  This patch makes the output look the same as
warnings or errors that come from gcc.

Change-Id: I895a656d22ce8b59da90c58b86a444c86c8edf84
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
11 years agoReview of documentation.
Michele Caini [Mon, 8 Oct 2012 20:34:39 +0000 (22:34 +0200)]
Review of documentation.

Documentation has been updated, changes apply to Qt5 as well as Qt4.

Change-Id: I562914a439d8d27dc9e6b1aa117007edce214cc6
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
11 years agoNotify accessibility events in QAbstractItemView
José Millán Soto [Fri, 7 Sep 2012 17:59:00 +0000 (19:59 +0200)]
Notify accessibility events in QAbstractItemView

Change-Id: Idd713dc3bc3e817529968384edd0418e151f0e5b
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
11 years agoUse constFind()/constEnd() for const_iterator-s
Konstantin Ritt [Fri, 12 Oct 2012 04:08:18 +0000 (07:08 +0300)]
Use constFind()/constEnd() for const_iterator-s

to make the strict iterators happy.

Change-Id: Ief4ec309b815f18dc4b2017d4f34c063db510c31
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
11 years agoChange hostname for dnslookup 'notfound' test cases.
Janne Anttila [Thu, 11 Oct 2012 11:33:11 +0000 (14:33 +0300)]
Change hostname for dnslookup 'notfound' test cases.

Microsoft DNS server used in Digia hosted Qt-Project CI system,
returns 'Server failed' error for 'invalid.' hostname. Because
the purpose of these autotests is to test 'notfound' use case, it should
be ok to use also 'invalid.invalid' hostname in these DNS queries.

Change-Id: I9e9c829f3858e7fa23feffd2ede018b19f676857
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
11 years agosyncqt: Fix warnings about missing QT_BEGIN_HEADER/NAMESPACE.
Friedemann Kleint [Fri, 12 Oct 2012 14:32:54 +0000 (16:32 +0200)]
syncqt: Fix warnings about missing QT_BEGIN_HEADER/NAMESPACE.

Do not print warnings when stop-processing pragma was encountered.

Change-Id: I0dd3b317b3a685afe613527988eb137325037e16
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoRemove the -falign-stack option from ICC's mkspec.
Thiago Macieira [Thu, 11 Oct 2012 23:34:44 +0000 (16:34 -0700)]
Remove the -falign-stack option from ICC's mkspec.

This option was necessary in early ICC 12 releases because of a
difference in interpreting the ABI requirements with GCC. According to
ICC devs, GCC changed the ABI on its own to require 16-byte-aligned
stacks on i386.

It looks like this option has been the default in later ICC 12
releases. At least 12.1 update 5 has it by default. ICC 13 does not
have the option anymore but accepts it silently for backwards
compatibility.

Change-Id: Id8bb4c250718eef2f02dc97bd47a0efd95b272fc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoqmake: fix reversed defines in vcxproj files
Joerg Bornemann [Thu, 11 Oct 2012 09:59:40 +0000 (11:59 +0200)]
qmake: fix reversed defines in vcxproj files

Change-Id: I9fbb4b563428bb23974d59050f4c71e8d1983ff3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoMac OSX: configure will use clang for any version >= 3
Shawn Rutledge [Tue, 9 Oct 2012 14:16:27 +0000 (16:16 +0200)]
Mac OSX: configure will use clang for any version  >= 3

Task-number: QTBUG-26140
Change-Id: Ifee00a9d15b053bb9d2c7b0d9bedca45e4d589d3
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoFix warnings from syncqt.
Friedemann Kleint [Fri, 12 Oct 2012 14:35:04 +0000 (16:35 +0200)]
Fix warnings from syncqt.

Stop processing in internal headers, use correct include
syntax.

Change-Id: I9dcf1f6f89907986b7b58658be514083f213a3e6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoFix "open with" functionality on OSX (FileOpenEvent)
Shawn Rutledge [Thu, 11 Oct 2012 11:09:56 +0000 (13:09 +0200)]
Fix "open with" functionality on OSX (FileOpenEvent)

QGuiApplicationPrivate::processWindowSystemEvent needs to handle the
FileOpen event type so that applications can receive the events from
the Finder.  This makes it possible to e.g. double-click a qml file
and open it in QML Viewer.

Task-number: QTBUG-26855
Change-Id: I1e14e478460e8823095e4a33cee1e0defbf76d8b
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
11 years agoBe able to obtain list of possible key combinations in platform integration
Oliver Wolff [Thu, 11 Oct 2012 05:40:14 +0000 (07:40 +0200)]
Be able to obtain list of possible key combinations in platform integration

As there is no way to obtain the list of possible keys for a shortcut
in a platform independent way there needs to be a way to get that
from the platform integration.

Task-number: QTBUG-26902
Change-Id: I520add56ee09d5c3c58709fb29dad2fbfe4c9d0b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
11 years agoAdded possibleKeys(QKeyEvent *) to QWindowsIntegration
Oliver Wolff [Thu, 11 Oct 2012 05:42:08 +0000 (07:42 +0200)]
Added possibleKeys(QKeyEvent *) to QWindowsIntegration

Task-number: QTBUG-26902
Change-Id: I08d244816eae8794b52f244f049ee1fb825dac8b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoUpdate qfiledialog ui to new style.
Frederik Gladhorn [Fri, 12 Oct 2012 09:58:01 +0000 (11:58 +0200)]
Update qfiledialog ui to new style.

Simply opened and saved in designer.
No changes otherwise.

Due to designer adding deprecated property margin, reverted parts manually.

Change-Id: I5edbf82126606e224da4d0d51baeedb13b39bd83
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
11 years agoSimplify transaction expiry mechanism
Gatis Paeglis [Mon, 1 Oct 2012 12:04:09 +0000 (14:04 +0200)]
Simplify transaction expiry mechanism

This patch makes transaction mechanism less scattered around and
conforms to the xdnd specification:

Don't block and keep a history of previous data. This can be very difficult to implement,
but it is clearly the ideal behavior from the user's perspective because it allows him to
drop something and then continue working with the assurance that the target will get the
data regardless of how slow the network connections are.

When the source receives XdndFinished, it can remove the item from its history, thereby keeping
it from getting too large. The source must also be prepared to throw out extremely old data
in case a target malfunctions.

I assume that 10min for drag-and-drop operation can be considered 'extremely' old data.

Change-Id: I73dcd21aee3ad188d2260e49d80824da6ba040ab
Task-numer: QTBUG-14493
Reviewed-by: David Faure (fixes for KDE) <faure@kde.org>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoMake sure timestamp is initialized before using it for seting selection owner.
Gatis Paeglis [Wed, 3 Oct 2012 12:53:33 +0000 (14:53 +0200)]
Make sure timestamp is initialized before using it for seting selection owner.

Convention from icccm: Clients attempting to acquire a selection must set
the time value of the xcb_set_selection_owner request to the timestamp of
the event triggering the acquisition attempt, not to XCB_CURRENT_TIME. In
some cases it happened that timestamp was set to XCB_CURRENT_TIME.

A zero-length append to a property is a way to obtain a timestamp for this
purpose; the timestamp is in the corresponding XCB_PROPERTY_NOTIFY event.
We used to have this mechanism in 4.8, it was achieved by XWindowEvent.

AFAIK there isn't an equivalent for XWindowEvent in XCB. Therefore i had to
introduce a new mechanism in QXcbConnection - getTimestamp. This function
blocks until it receives the requested event.

Change-Id: Ide46a4fdd44cf026fdd17a79d3c4b17741d1b7d4
Task-number: QTBUG-26783
Reviewed-by: Uli Schlachter <psychon@znc.in>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoLink to Item Views Puzzle Example in QListView docs.
Mitch Curtis [Fri, 12 Oct 2012 14:57:22 +0000 (16:57 +0200)]
Link to Item Views Puzzle Example in QListView docs.

Change-Id: I75972727077fa1aa1ec66995c4d0ea67057d283b
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
11 years agoCheck that row and column are not less than 0 in indexFromLogical
José Millán Soto [Wed, 26 Sep 2012 11:11:35 +0000 (13:11 +0200)]
Check that row and column are not less than 0 in indexFromLogical

Change-Id: Icf6dbb234513de12c772618a046461b8674b01ce
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
11 years agoDo not accept key events if a widget is disabled
Oliver Wolff [Thu, 4 Oct 2012 13:02:48 +0000 (15:02 +0200)]
Do not accept key events if a widget is disabled

The disabled state was handled in qapplication_xxx.cpp before.
As the platform integration only knows about windows and
not widgets the state check is now done in qwidget. This commit
just adds key events to the list of events which are ignored
if the widget is disabled. This list also contains mouse events
for example.

Task-number: QTBUG-27417

Change-Id: I55949e1c1aaa992ba71df51c5b5e8177ec6f1e86
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
11 years agoFix moc preprocessor-only mode with input that contains seemingly invalid identifiers
Simon Hausmann [Fri, 12 Oct 2012 12:06:19 +0000 (14:06 +0200)]
Fix moc preprocessor-only mode with input that contains seemingly invalid identifiers

In WebKit we use moc -E to pre-process various files before throwing at
further build creation tools. The pre-processing is used to filter out
code depending in #ifdef'fed features.

The latest addition to the family of pre-processed files is the CSS grammar,
which is written in Bison. It contains rule lines like

   $$ = parser->createFoo()

and when pre-processing this moc stumbles over the dollar sign. Instead
of ignoring un-tokenizable input we should add it to the current token
if we're in preprocessor-only mode, otherwise the $$ gets eaten and we
produce data-loss by printing out less characters than.

Change-Id: Ib32e7c04b38dd2ba3726201e76f27405f7ea6c0d
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
11 years agoFix number of available printers in CUPS support.
Rafael Roquetto [Wed, 10 Oct 2012 18:43:50 +0000 (15:43 -0300)]
Fix number of available printers in CUPS support.

If the number of available printers changes, we want
to update the count. Additionally, if that number has
gone to zero, we want to ensure that the number of
available printers in the static object is reset to
zero.

This fixes a crash that occurs if:
 * You print
 * You kill cupsd (or it crashes because you're porting it and your port is unstable)
 * You try to print again before restarting it.

Change-Id: I6c6069db9d800ce7426e75df760829fea278e56e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoMake QValidator tests do not require a QApplication
Giuseppe D'Angelo [Sun, 7 Oct 2012 15:09:46 +0000 (16:09 +0100)]
Make QValidator tests do not require a QApplication

Change-Id: I9aae997e33672203470b0429cc061a1adf88dfe9
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: David Faure <david.faure@kdab.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
11 years agoBlackberry: Populating the QCoreApplicationData
Fabian Bumberger [Tue, 9 Oct 2012 17:34:29 +0000 (19:34 +0200)]
Blackberry: Populating the QCoreApplicationData

Change-Id: I7adb2e207cab89fbad9458cd0bcb856ecd2288f0
Reviewed-by: Peter Hartmann <phartmann@rim.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
11 years agoBlackberry: Emit aboutToBlock() and awake() correctly in the dispatcher
Thomas McGuire [Tue, 9 Oct 2012 12:07:28 +0000 (14:07 +0200)]
Blackberry: Emit aboutToBlock() and awake() correctly in the dispatcher

On Blackberry, select() can actually temporarily wake up to process
mative BPS events. Make sure to emit the aboutToBlock() and awake()
signals in this situation accordingly.

Change-Id: Ib324e702feb1cfebdc6926f80af9c92f291a2b94
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
11 years agoRemove unused private header
Jens Bache-Wiig [Fri, 12 Oct 2012 07:22:40 +0000 (09:22 +0200)]
Remove unused private header

This was a leftover after removing motif style from the repo.

Change-Id: I98d47a9443ffce2be34d73e779a0787c0b68913f
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
11 years agoqfeatures.txt: cleanup obsolete cde & motif styles
J-P Nurmi [Fri, 12 Oct 2012 07:21:30 +0000 (09:21 +0200)]
qfeatures.txt: cleanup obsolete cde & motif styles

both styles were removed in 570ae4

Change-Id: I47b3b268191aecd1c04f1c1f1bd0f500332e3ef8
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
11 years agoAuto tests: revise cursor dependant tests
J-P Nurmi [Thu, 20 Sep 2012 13:35:21 +0000 (15:35 +0200)]
Auto tests: revise cursor dependant tests

Cursor dependant auto tests are currently skipped in various ways.
Some are checking PlatformQuirks::haveMouseCursor() that tries to
detect if the desktop environment is MeeGo, using obsolete Q_WS_X11.
Some are skipped if QT_NO_CURSOR or Q_OS_WINCE is defined and
some are actually missing the approriate guards.

=> unify by defining QTEST_NO_CURSOR in qtest-config.h when
appropriate ie. for platforms that have no regular mouse cursor
support or when QT_NO_CURSOR is defined.

Task-number: QTBUG-22551
Change-Id: I9a1e0e3156617945ae46226c79268955454c8a9a
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
11 years agoDoc: Removed references to stale links.
Jerome Pasion [Thu, 11 Oct 2012 14:02:22 +0000 (16:02 +0200)]
Doc: Removed references to stale links.

The links are from the qt-webpages.qdoc and no longer exist.

Change-Id: I8329032215fa77811117e2767bae745795b209cb
Reviewed-by: Martin Smith <martin.smith@digia.com>
11 years agoQGtkStyle: fix a warning
Marc Mutz [Thu, 11 Oct 2012 17:04:57 +0000 (19:04 +0200)]
QGtkStyle: fix a warning

Commit c0893962ef94f12594f936ef2a50db6d0328eca0 added two
definitions of a variable named gtkToggleButtonStyle in nested
scopes. Because of name lookup rules, the second one wasn't
initialised with the first one, but with itself.

This leaves the second gtkToggleButtonStyle uninit'ed.

Simply remove the surplus declaration, leaving the name to
the original declaration.

Change-Id: I2269e1093f54643ff4dce27b39cc033db6697782
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
11 years agoAccessibility: Implement GetVersion and GetLocale in app adaptor.
Frederik Gladhorn [Fri, 28 Sep 2012 18:18:22 +0000 (20:18 +0200)]
Accessibility: Implement GetVersion and GetLocale in app adaptor.

Change-Id: I73a49b22add9e268907025dd0bf7ec76e7fd0c0b
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoAdd workaround for typo in libatspi VisualdataChanged
Frederik Gladhorn [Mon, 1 Oct 2012 10:02:44 +0000 (12:02 +0200)]
Add workaround for typo in libatspi VisualdataChanged

Change-Id: I6375d77fac4e743a372f18b3e3d63c128ce51271
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoFix missing return in QtOpenGl/paintedwindow example.
Friedemann Kleint [Thu, 11 Oct 2012 14:58:38 +0000 (16:58 +0200)]
Fix missing return in QtOpenGl/paintedwindow example.

Change-Id: I17da0e93bb7c1b0cdbb5b76035ec913cbc616608
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
11 years agoStabilize Accessibility/Combo test.
Friedemann Kleint [Thu, 11 Oct 2012 12:46:16 +0000 (14:46 +0200)]
Stabilize Accessibility/Combo test.

The Windows combo animation causes a delay, introduce
QTRY_VERIFY. Fix warnings about being unable to
set geometry on Windows.

Change-Id: I52ca960c06f023ade3afe85f31deaf8e32edff26
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
11 years agoOpenGL: Add missing WINAPI calling convention for QGL functions
Sean Harmer [Thu, 11 Oct 2012 13:08:45 +0000 (14:08 +0100)]
OpenGL: Add missing WINAPI calling convention for QGL functions

This is the QGL equivalent of commit

602cab9bb2072c5564bbb43c4125e04f98266043

Without this QGLExtensionMatcher causes stack corruption when using
a core profile GL context due to the call to glGetStringi() with
an incorrect calling convention.

Change-Id: Ibd86645e04df8c650c182fecfc8c481dae8a75b2
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoQtPrintSupport: Fix build with QT_NO_PICTURE.
Sérgio Martins [Tue, 9 Oct 2012 22:34:29 +0000 (23:34 +0100)]
QtPrintSupport: Fix build with QT_NO_PICTURE.

Printer support depends on having Picture support.
If QT_NO_PICTURE is defined, qfeatures.h will define
QT_NO_PRINTER.

Not all code is including qfeatures.h, which causes inconsistency,
some code has QT_NO_PRINTER defined and some has not, which causes
the build to fail.

Change-Id: I10a854244a41d017b921b731ec0e08f90a3326cf
Reviewed-by: Holger Ihrig <holger.ihrig@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
11 years agoqdoc: qdoc now can run in 2 passes
Martin Smith [Thu, 11 Oct 2012 12:04:21 +0000 (14:04 +0200)]
qdoc: qdoc now can run in 2 passes

Two command line options have been added, -prepare and -generate.
If you run qdoc with -prepare, qdoc reads and parses the source
files but does not generate the documentation. It only creates
the .index file for the module you are running qdoc on.

If you run qdoc with -generate, qdoc reads and parses the source
files as well as the .index files created by running qdoc with
-prepare, and it generates the documentation but no .index file.

If you run without either option, qdoc runs as before, i.e. it
runs both passes as a single pass.

Task number: QTBUG-27539

Change-Id: Idbfe3f0f9dff58283596b504f00dff3f70f6e371
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>