profile/ivi/qtbase.git
12 years agoRemove the usage of deprecated qdoc macros.
Casper van Donderen [Thu, 1 Mar 2012 14:28:31 +0000 (15:28 +0100)]
Remove the usage of deprecated qdoc macros.

QDoc now has support for Doxygen style commands for italics, bold
and list items. This change applies that change in QDoc to the
actual documentation.

Task-number: QTBUG-24578
Change-Id: I519bf9c29b14092e3ab6067612f42bf749eeedf5
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoMark overload of QAccessible::updateAccessibility as deprecated.
Frederik Gladhorn [Fri, 2 Mar 2012 18:38:12 +0000 (19:38 +0100)]
Mark overload of QAccessible::updateAccessibility as deprecated.

updateAccessibility(const QAccessibleEvent &event) should be used,
updateAccessibility(QObject *object, int child, Event reason) is deprecated.

Change-Id: I92b32579ff202681189e9581365d2891e5d1e994
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoName threads properly
mae [Thu, 1 Mar 2012 18:42:50 +0000 (19:42 +0100)]
Name threads properly

When there is no QObject subclass with Q_OBJECT macro,
we must at least set an object name

Change-Id: Ib429a9b246d9d6b4b4cfb11593e4f358850677f2
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoxcb: Check for SHAPE extension before using it
Uli Schlachter [Fri, 2 Mar 2012 15:33:01 +0000 (16:33 +0100)]
xcb: Check for SHAPE extension before using it

This change makes sure that the X11 server really supports the SHAPE
extension before it is used.

Before this, libxcb would disconnect from the server as soon as it was
told to send a SHAPE request to a server which doesn't support SHAPE. Oh
and of course it would do so without any good error message.

Change-Id: I5f9481e488925e74e62f229e9f637ef262020c04
Signed-off-by: Uli Schlachter <psychon@znc.in>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoget rid of Option::user_configs
Oswald Buddenhagen [Thu, 2 Feb 2012 18:31:57 +0000 (19:31 +0100)]
get rid of Option::user_configs

merge them into before_user_vars. they are evaluated right after another
anyway.

Change-Id: I11859284b363fee01233f6e20989444fef711d0d
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoremove now unused QMakeProject c'tors
Oswald Buddenhagen [Mon, 20 Feb 2012 21:19:11 +0000 (22:19 +0100)]
remove now unused QMakeProject c'tors

Change-Id: Ia65d49df50a5610bbd88417ca90ac348a774a1e1
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agomake evaluation of spec+cache independent of build pass context
Oswald Buddenhagen [Tue, 21 Feb 2012 11:56:47 +0000 (12:56 +0100)]
make evaluation of spec+cache independent of build pass context

don't inject the build pass specific variables into the project even
before evaluating the .spec file and the .qmake.cache. they are not
supposed to base configuration on that - feature files should do that
later.

the immediate advantage of this is that base_vars is never manipulated
upfront any more, which allows for cleaner setup paths. also, we can do
more caching of the spec+cache contents.

Change-Id: I19d7f8bec1fb7c3b54121e26794340b287055ebf
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoRemove the LIBS from platformsupport
Jørgen Lind [Tue, 28 Feb 2012 08:27:25 +0000 (09:27 +0100)]
Remove the LIBS from platformsupport

The application / library that uses this should know it needs to link
to ie. udev, xrendr etc.

Change-Id: I9e3ffd4d98b3bd66abb8e621378b010da7feda7a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoFix get_accFocus() to return CHILDID_SELF when it returns itself.
Jan-Arve Saether [Fri, 2 Mar 2012 15:51:26 +0000 (16:51 +0100)]
Fix get_accFocus() to return CHILDID_SELF when it returns itself.

This means that the AT client knows it should not have to ask for
the focus child anymore.
Previously, some clients (NVDA) kept on asking infinitely because of
this.

Change-Id: Ia2bd2e1088a899f7d1a0c9189024accdacfd693b
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agoImprove debugging in the windows accessibility bridge.
Jan-Arve Saether [Fri, 2 Mar 2012 15:06:04 +0000 (16:06 +0100)]
Improve debugging in the windows accessibility bridge.

set QT_DEBUG_ACCESSIBILITY=(1|0) to turn logging on or off

Change-Id: Ibd5b77699decf0cf02bc6b6cc656fa237de29124
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agoFix QWizard autotest for Windows 7 Classic theme
Miikka Heikkinen [Fri, 2 Mar 2012 11:47:47 +0000 (13:47 +0200)]
Fix QWizard autotest for Windows 7 Classic theme

QWizard always forced Aero style even if Classic theme was used.
Added a check for Classic theme into initialization.

Task-number: QTBUG-24618
Change-Id: I0793df62e022037835e1c1a311143f06cc4382b4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoUse correct types in QResource.
Robin Burchell [Fri, 2 Mar 2012 14:05:59 +0000 (15:05 +0100)]
Use correct types in QResource.

qHash() returns uint, not int, so change all interactions with hashing to use
uint to match.

This blocks the introduction of a new (better) hashing algorithm because it
currently breaks numerous tests: rcc would (correctly) write a uint hash value
to the qrc files, but QResource would attempt to mangle it around as an int.

This wasn't a problem with the old hash, because it deliberately threw away
data (h &= 0x0fffffff), possibly because of someone not being able to
diagnose precisly this problem.

Change-Id: I46fb42acc100fdd3bedd714f6dc91aeca91d0351
Reviewed-by: hjk <qthjk@ovi.com>
12 years agodon't announce a dynamic .qmake.cache if we don't actually create one
Oswald Buddenhagen [Fri, 2 Mar 2012 10:56:16 +0000 (11:56 +0100)]
don't announce a dynamic .qmake.cache if we don't actually create one

otherwise we are breaking the "less hacky" configurations. whoops.

Change-Id: Ibb037753fbaf30beae3d30173be77d48b978b60b
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
12 years agoImproving clipboard integration
Kevin Krammer [Tue, 28 Feb 2012 15:35:08 +0000 (16:35 +0100)]
Improving clipboard integration

Derive a data accessor class from QMimeData so application level code can
query MIME type availability through it or directly attempt to fetch
data by MIME type even if the type is not yet known to QBBClipboard.

Also make sure any MIME type used by the application in setMimeData
operations is checked for availability when being queried for formats.

Change-Id: If8174adf3f3383496a354d291ef7d36b9732be1d
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoFixing z-ordering of windows
Kevin Krammer [Tue, 28 Feb 2012 14:48:57 +0000 (15:48 +0100)]
Fixing z-ordering of windows

The application root window is at z-order == 0, all platform windows created
for Qt windows are its descendants, so their base value for z-order needs
to be 1.

Change-Id: I7c9615ffac6757c31900a7640eb0ffdd6065b722
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
Reviewed-by: Nick Ratelle <nratelle@qnx.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
12 years agoMake the CONFIG and QT_CONFIG contents available downstream.
Stephen Kelly [Thu, 1 Mar 2012 10:37:51 +0000 (11:37 +0100)]
Make the CONFIG and QT_CONFIG contents available downstream.

Change-Id: I62dbc5a695e41179de9f6acd11aa7bc592cac6f3
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoFix sizing in QGraphicsView itemsAtPosition auto test
Jonathan Liu [Wed, 29 Feb 2012 21:09:26 +0000 (08:09 +1100)]
Fix sizing in QGraphicsView itemsAtPosition auto test

The auto test may fail incorrectly depending on the width of the
QGraphicsView frame. To ensure more consistent test results, the frame is
disabled.

Change-Id: I8d70fb07e45803230954f776947d525e4cf9050f
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoAdd additional QGraphicsView tests for regression
Jonathan Liu [Tue, 28 Feb 2012 21:18:43 +0000 (08:18 +1100)]
Add additional QGraphicsView tests for regression

Add additional tests for graphics view tooltip regression introduced by
7c0d15a22266a425c9e9ac0120d6774e120fe01e.

Task-number: QTBUG-17517
Task-number: QTBUG-22663
Change-Id: I5e0d0e19504730a3e14ac84712a366dbebe688e6
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
(cherry picked from commit aaa46755dcc15b8baaa0d1b928828eb60e0babbc)

12 years agoRevert "Don't rely on mapFromGlobal in QGraphicsScenePrivate::itemsAtPosition."
Jonathan Liu [Thu, 23 Feb 2012 13:42:34 +0000 (00:42 +1100)]
Revert "Don't rely on mapFromGlobal in QGraphicsScenePrivate::itemsAtPosition."

This reverts commit 7c0d15a22266a425c9e9ac0120d6774e120fe01e.
The commit caused a regression whereby tooltips may be shown even if the
mouse is not over the item if it has the Qt::ItemIgnoresTransformations
flag and the QGraphicsView had been scaled.

Task-number: QTBUG-17517
Task-number: QTBUG-22663
Change-Id: Ib7fd788d9712c5e659fe07182f9505a4eb135ab2
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
(cherry picked from commit 15c14584199dc43e4a309fc331f3144009008128)

12 years agoExport QPaintEnginePrivate from QtGui
Bradley T. Hughes [Thu, 1 Mar 2012 14:35:43 +0000 (15:35 +0100)]
Export QPaintEnginePrivate from QtGui

This allows the QCoreGraphicsPaintEngine to use QPaintEnginePrivate
members (e.g. pdev and drawBoxTextItem()).

Change-Id: I5bed3cb007ae469816afce619edd55f155b04fa9
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoRemove Q_BYTE_ORDER and -*-endian arguments from configures
Bradley T. Hughes [Fri, 24 Feb 2012 10:11:02 +0000 (11:11 +0100)]
Remove Q_BYTE_ORDER and -*-endian arguments from configures

Do not write Q_BYTE_ORDER to qconfig.h in the configures. Instead,
we #define Q_BYTE_ORDER in qprocessordetection.h, since many CPUs only
support a single endian format. For bi-endian processors, we set
Q_BYTE_ORDER depending on how the preprocessor sets __BYTE_ORDER__,
__BIG_ENDIAN__, or __LITTLE_ENDIAN__ (instead of using a compile test
to do so).

For operating systems that only support a single byte order, we can
check for Q_OS_* in addition to the preprocessor macros above. This is
possible because qprocessordetection.h is included by qglobal.h after
Q_OS_* and Q_CC_* detection has been done. Do this for Windows CE,
which is always little- endian according to MSDN.

Change-Id: I019a95e05252ef69895c4b38fbfa6ebfb6a943cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoFix QApplication autotest crash when running on multiple screens
Miikka Heikkinen [Thu, 1 Mar 2012 11:19:24 +0000 (13:19 +0200)]
Fix QApplication autotest crash when running on multiple screens

Screens need to be destroyed in reverse order to ensure the primary
screen stays valid when other screens are destroyed.

Task-number: QTBUG-24300
Change-Id: I9d9d710aa67ec045baa8bf292833ffe7d9eea935
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoAdd note about failing test when using shared-mime-info < 1.0
David Faure [Thu, 1 Mar 2012 15:41:39 +0000 (16:41 +0100)]
Add note about failing test when using shared-mime-info < 1.0

Change-Id: I3ba9d14d915a579b9e102114866f6c9e0344ba16
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoLink against the precompiled header.
Andreas Holzammer [Fri, 2 Mar 2012 10:02:03 +0000 (11:02 +0100)]
Link against the precompiled header.

This fixes the build for Visual Studio 2011.

Change-Id: I8c43eef851d76f8cdde13a57ea3dcd9cf32df0ab
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoFix QPixmap::grabWidget() on Windows.
Friedemann Kleint [Thu, 1 Mar 2012 16:31:37 +0000 (17:31 +0100)]
Fix QPixmap::grabWidget() on Windows.

Do not draw on the backingstore DC when drawing
to a pixmap. Access the paintdevice for checking via
the QPaintEngine since QPainter returns the clipdevice,
which is a widget.
Fix warning about accessing handle of 0-window in the
test.

Task-number: QTBUG-24183

Change-Id: Ie91ea6ab9d09528c7ec1d35633f9a0ee667719b1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoSupport 16+4 mouse buttons within the generic/evdevmouse plugin.
Rick Stockton [Thu, 1 Mar 2012 07:56:34 +0000 (23:56 -0800)]
Support 16+4 mouse buttons within the generic/evdevmouse plugin.

The Kernel's evdev module is capable of presenting up to 16 mouse
buttons, plus wheel events (UP, DOWN, LEFT, and RIGHT). This
patch updates our Plugin, so that it tranlates all of those button
numbers into corresponding MouseEvent Qt::MouseButton values.

Task-number: QTBUG-24590

Change-Id: Ib8cbb9500280c76f06a51ce95095e22ae84de1c6
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoclean up build pass project initialization
Oswald Buddenhagen [Tue, 21 Feb 2012 11:44:27 +0000 (12:44 +0100)]
clean up build pass project initialization

instead of messing with the Option singleton, add a way to inject
extra config values into QMakeProject.

Change-Id: Ia347dcc38af2c72913e30ebf5c2b4044f93b4f5f
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agomove finding the makespec to Option
Oswald Buddenhagen [Thu, 23 Feb 2012 18:34:10 +0000 (19:34 +0100)]
move finding the makespec to Option

this is a one-time operation which depends only on the invocation, so
this new home is much more appropriate.

Change-Id: I07c66d95a9ae01a664cec17564995311fb78ec9b
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agotestlib: Add selftests for -v1 and -v2 command-line switches.
Jason McDonald [Thu, 1 Mar 2012 01:01:49 +0000 (11:01 +1000)]
testlib: Add selftests for -v1 and -v2 command-line switches.

These tests don't have their own source code but rather reuse the
counting selftest with additional command-line options.

Note that currently the -v1 switch only changes the plain text output,
and the expected xml output is identical to that of the counting test.
This may change in the future however.

This commit also restores a couple of lists to alphabetical order, where
the findtestdata selftest was not sorted into the list correctly.

Change-Id: Ie38e255f8029157b34162b3864b5fa66e137d74a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agotestlib: Improve documentation of verbose test logging options.
Jason McDonald [Wed, 29 Feb 2012 02:49:25 +0000 (12:49 +1000)]
testlib: Improve documentation of verbose test logging options.

Change the help output to show which options only work for plain text
logging.

Change-Id: I39eb7cd0793cdbe553c230334c6cd532b4929f61
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoAdd protocol type B support to the evdevtouch plugin
Laszlo Agocs [Thu, 1 Mar 2012 07:59:33 +0000 (09:59 +0200)]
Add protocol type B support to the evdevtouch plugin

Also adds optional support for libmtdev (a helper library which
translates transparently from type A to B when using type A kernel
drivers).

Change-Id: Ic9c065b2fd130e9db2dd07e7dc103e9d45c08c99
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agosearch for default spec just like for other ones
Oswald Buddenhagen [Thu, 23 Feb 2012 16:30:58 +0000 (17:30 +0100)]
search for default spec just like for other ones

that way qtbase will find its spec without hacking .qmake.cache.
note that passing "-spec default" on the command line would have already
triggered the normal path, so artificial limitation did not even provide
safety against abuse (it is arguably pointless/counterproductive for
other projects than qtbase to have a default spec).

Change-Id: Ib0c3e6498fd70cd6f9561951d72a47165878bb33
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoremove some bogus include locations
Oswald Buddenhagen [Wed, 29 Feb 2012 20:26:49 +0000 (21:26 +0100)]
remove some bogus include locations

nothing to be found in <sourcedir>/include.
neither in <builddir>/src/corelib/xml.

Change-Id: I381391a64542dc2ac7b421b6646c60a1b7a14639
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agouse VPATH to locate sources
Oswald Buddenhagen [Wed, 29 Feb 2012 20:01:15 +0000 (21:01 +0100)]
use VPATH to locate sources

makes the file a "tad" more concise

Change-Id: I81d9721942890659ac93b32f5988f9c005c88e87
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agomerge Makefile.win32-g++{,-sh}
Oswald Buddenhagen [Wed, 29 Feb 2012 18:38:03 +0000 (19:38 +0100)]
merge Makefile.win32-g++{,-sh}

the only difference is in the copy & del commands. the msys tools are
tolerant about windows paths, so this just works.
the in-makefile variant detection is stolen from tools/configure/.

Change-Id: Ia283c1fe2e2aaa8cd5b1dfd7ae29244115f07d65
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agofix configure -redo
Oswald Buddenhagen [Wed, 29 Feb 2012 19:21:41 +0000 (20:21 +0100)]
fix configure -redo

-redo must be the first argument (except -srcdir, which we treat
differently), so let's pass the user arguments first.

Change-Id: I5da37d1a6e1aec67449daf64b8bd2ffcc0b075a4
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agocosmetics: remove redundant conditional, add a comment & reshuffle code
Oswald Buddenhagen [Thu, 23 Feb 2012 18:01:26 +0000 (19:01 +0100)]
cosmetics: remove redundant conditional, add a comment & reshuffle code

Change-Id: I71c7e18db63f3581b8c818ad178aeb4f6ccf9446
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agolook for features relative to spec only in advertized place
Oswald Buddenhagen [Thu, 23 Feb 2012 17:56:11 +0000 (18:56 +0100)]
look for features relative to spec only in advertized place

that is, spec/../features/ (i.e., mkspecs/features/) - and not any
directory up to the root.

Change-Id: Ie5fdf2898fba5ac93583571edc24629471604798
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoUnset _NET_WM_USER_TIME_WINDOW before destroying the window
Jan Arne Petersen [Fri, 24 Feb 2012 17:05:06 +0000 (18:05 +0100)]
Unset _NET_WM_USER_TIME_WINDOW before destroying the window

Otherwise metacity was crashing when a QWindow was destroyed immediately
after being activated, because metacity was trying to select events
(XSelectInput) for the already destroyed m_netWmUserTimeWindow.

Task-number: QTBUG-24492
Change-Id: Iedbe7bdd6b26110ca8bec6f33525209ae551ffd5
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoTake into account input shaping in findRealWindow
Albert Astals Cid [Wed, 22 Feb 2012 09:33:09 +0000 (10:33 +0100)]
Take into account input shaping in findRealWindow

In previous commits we took into account bound shaping, but X also
supports input shaping, so make sure it's inside both input and bounding
shaping to consider the position as inside a window

My tests show that when unset Bound Shaping and Input Shaping return the
rectangle of the window itself, so we need to be inside both of the
rectangle sets to consider the position as a dragabble position for the
window

Change-Id: I77973e51168d2a6d274d166f29f32e1bc02c32c3
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agomake default_pro.prf advertize dynamically created .qmake.cache
Oswald Buddenhagen [Thu, 1 Mar 2012 13:34:48 +0000 (14:34 +0100)]
make default_pro.prf advertize dynamically created .qmake.cache

moving the detection of .qmake.cache to the qmake startup had the side
effect that a suddenly popping up cache would not be picked up by
nested projects any more.
this is not supposed to work in the first place, but the syncqt hack for
building against non-installed modules relies on it. until we have
cleaned that up properly, we need a way to notify qmake about the
appearance of the cache file.

Change-Id: I450646b936e3bb2ef2ed3aba05df58e521ccdc61
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoFix tst_qregexp with QStringBuilder
Olivier Goffart [Tue, 28 Feb 2012 09:01:24 +0000 (10:01 +0100)]
Fix tst_qregexp with QStringBuilder

Change-Id: I1ac2a5c9ea5657ad2916465b77271e3d53c67cde
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoRevert "Don't render glyph with FT with fetchMetricsOnly"
Jiang Jiang [Thu, 1 Mar 2012 13:40:21 +0000 (14:40 +0100)]
Revert "Don't render glyph with FT with fetchMetricsOnly"

Report https://bugs.webkit.org/show_bug.cgi?id=79561 shows that
this commit will cause significant slow down in text handling
operations. Though the exact reason is unknown we should revert
it first and find out the reason later.

This reverts commit 692064bcfd116c2f3a2b30572e511ee68c6a0531.

Change-Id: I16a56c3093bdfa2119ab6a6e9049ef2925468e29
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
12 years agoRemove ARMFPA support and Q_DOUBLE_FORMAT detection
Bradley T. Hughes [Fri, 24 Feb 2012 09:52:11 +0000 (01:52 -0800)]
Remove ARMFPA support and Q_DOUBLE_FORMAT detection

Remove the -armfpa option the config.tests/unix/doubleformat*
detection. The places where we used QT_ARMFPA and Q_DOUBLE_FORMAT
has been removed as well.

Rationale: ARM FPA with GCC does not work with EABI. Qt currently
does not support compiling without EABI, making ARM FPA an
impossibility. It is unknown whether other compilers provide ARM FPA
support with EABI. Support for ARM FPA can be re-added in the future
should the need arise, but since ARM VFP is available for ARMv5 and up,
we should encourage implementors to instead use soft-floats or VFP.

Change-Id: I3671aba575118ae3e3e6d769759301c8f2f496f5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoAllow using multi fontengine in QTextLayout with QRawFont.
Pierre Rossi [Mon, 16 Jan 2012 16:40:21 +0000 (17:40 +0100)]
Allow using multi fontengine in QTextLayout with QRawFont.

This change enables us to instantiate a QFontEngineMulti that takes
the raw font's font engine as its primary engine but can use fallback
engines based on the platform. Since this can be quite expensive, we
defer the query for fallback families' names until it's needed and
we cache the resulting multi font engine.

Change-Id: I390dbc1cb2fe61d56867f29a03f313eb3eb49dc3
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
12 years agoAdd support for QRawFont in QTextLayout.
Pierre Rossi [Fri, 16 Dec 2011 18:26:40 +0000 (19:26 +0100)]
Add support for QRawFont in QTextLayout.

The purpose of this change is to allow shaping complex
text while using QRawFont.
This is needed for WebKit so that we can switch to
using QRawFont everywhere and be more in line with
what other WebKit ports do.
Since this change slightly bends the aim of QRawFont,
let's reserve this for internal use for now.

Change-Id: I5ec0881f50ce288350bd277570cb5f1fb70c355c
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
12 years agoWindows: Use correct drop data in processDrop().
Friedemann Kleint [Thu, 1 Mar 2012 14:40:25 +0000 (15:40 +0100)]
Windows: Use correct drop data in processDrop().

Fix Qt Designer Drag & Drop.

Change-Id: Iabed622efc5e23080f7a91b8d9e433e2c0cee063
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoCocoa: Implement QPlatformTheme:palette()
Morten Johan Sorvig [Thu, 23 Feb 2012 07:50:28 +0000 (08:50 +0100)]
Cocoa: Implement QPlatformTheme:palette()

Causes a new test failure in QGraphicsProxyWidget::updateAndDelete,
expand the EXPECT_FAIL to cover that one as well.

Change-Id: If9da757206445d17510c4fac82a559de7b8c0563
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoUse QSystemError for QDnsLookup windows backend
Shane Kearns [Fri, 24 Feb 2012 13:07:24 +0000 (13:07 +0000)]
Use QSystemError for QDnsLookup windows backend

The OS provides the error string in this case.
This gives more information to the developer seeing a generic
error.

Change-Id: Ia03642982f3513ee5a8a9fa98d918e948f8d97a5
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
12 years agoFix buffer overrun crash running MSVC2010 win32 Qt on win64
Shane Kearns [Thu, 23 Feb 2012 15:57:15 +0000 (15:57 +0000)]
Fix buffer overrun crash running MSVC2010 win32 Qt on win64

When loading dnsapi.dll as a plugin, we experience crashes because
the calling convention is not specified.
The default is _cdecl, but __stdcall (via the WINAPI macro) should
be used for windows APIs.
Mismatched calling convention results in corruption of local variables,
probably because the stack pointer is incorrect and SP offsets are
used in optimised builds rather than frame pointer offsets.

Since the library has been available since Windows 2000, I don't
think that we need to load it dynamically.
(Unlike the unix version where it isn't part of the LSB)

Also checked that the current release of mingw works.

Task-number: QTBUG-24227
Change-Id: I37c0a6aa0c133799c2a6dd9391ca1435ba2539ea
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoQBoolBlocker: make constructor explicit and disable copying
Marc Mutz [Thu, 1 Mar 2012 07:33:15 +0000 (08:33 +0100)]
QBoolBlocker: make constructor explicit and disable copying

Change-Id: If294eff3f84f837ed554c572527d46a89660de9c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoSet texture parameters before allocating the texture.
Gunnar Sletta [Thu, 1 Mar 2012 10:59:03 +0000 (11:59 +0100)]
Set texture parameters before allocating the texture.

Some drivers use this as a hint to decide on weither to preallocate
mipmap memory or not.

Change-Id: I2fd438a9625b658c7f30fe39a9d63ba5396f9679
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
12 years agoqmake-test: Fix jom/nmake handling on Windows.
Friedemann Kleint [Thu, 1 Mar 2012 09:37:58 +0000 (10:37 +0100)]
qmake-test: Fix jom/nmake handling on Windows.

The test fails if MAKEFLAGS is set up for jom since the test
always uses nmake. Remove MAKEFLAGS from the process environment.

Change-Id: Idaed3cc964832b83c282a59fc5257572c520b882
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
12 years agoAdd support for _NET_ACTIVE_WINDOW on xcb
Jan Arne Petersen [Tue, 28 Feb 2012 09:54:34 +0000 (10:54 +0100)]
Add support for _NET_ACTIVE_WINDOW on xcb

Use a _NET_ACTIVE_WINDOW client message instead of xcb_set_input_focus
for activating toplevel windows on xcb.

According to the Extended Window Manager Hints the right way to activate
a top-level window is using _NET_ACTIVE_WINDOW (when it is supported by
the WM). Other approaches like calling xcb_set_input_focus should be
avoided when possible, since the WM cannot intercept them.

Change-Id: I9be4901f56cbcfb563baf73ccd71ff17a9bdc1d2
Reviewed-by: Uli Schlachter <psychon@znc.in>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoSkip the network SSL test on Windows.
Friedemann Kleint [Thu, 1 Mar 2012 08:38:45 +0000 (09:38 +0100)]
Skip the network SSL test on Windows.

For SSL, this would require an OpenSSL library to be installed.

Change-Id: I2a320e7faf40ef925c90dbe539f912e4a8fc13fc
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
12 years agoAdded QPlatformScreenBuffer
Jørgen Lind [Wed, 15 Feb 2012 16:08:20 +0000 (17:08 +0100)]
Added QPlatformScreenBuffer

And moved the pageflipper into its own file

Done with: Paul

Change-Id: I0af34075ce8673a66025cb761c0fe4ff6c0ab0fe
Reviewed-by: Jason Barron <jason.barron@nokia.com>
12 years agoCodeCoverage: Exclude all header files from intrumentation.
Caroline Chao [Wed, 29 Feb 2012 08:21:03 +0000 (09:21 +0100)]
CodeCoverage: Exclude all header files from intrumentation.

Currently only a small fraction of all the headers are included since only
the headers found in the pro file folder are included.

This is confusing and arbitrary. With this change all the headers are now
excluded from the instrumentation.

Change-Id: If4322421f3b3e5fcd45f006421690eaa6bf645e0
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoChanged qchar unittest to check return from QFINDTESTDATA
Kurt Korbatits [Thu, 1 Mar 2012 03:18:21 +0000 (13:18 +1000)]
Changed qchar unittest to check return from QFINDTESTDATA

- Changed qchar unittest to check string QFINDTESTDATA
  returns is not empty.

Change-Id: Idb3997aaa5d5220272915c1e2538175205b3d6e8
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoFixed qlocale unittest to install subprogram syslocaleapp correctly
Kurt Korbatits [Thu, 1 Mar 2012 03:33:40 +0000 (13:33 +1000)]
Fixed qlocale unittest to install subprogram syslocaleapp correctly

- It was trying to install syslocaleapp sub program as TESTDATA
  instead of an application.

Change-Id: I2117d11335bc2fd37a8ccc9a03b0337382f0177f
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoChanged qdir unittest remove() to check actual file removed
Kurt Korbatits [Thu, 1 Mar 2012 02:57:37 +0000 (12:57 +1000)]
Changed qdir unittest remove() to check actual file removed

- Changed remove() test to check the file just removed is gone.

Change-Id: I0b6c176e624134402b5547866064f436ce063f16
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoChanged qlogging unittest to install subprogram
Kurt Korbatits [Thu, 1 Mar 2012 02:46:34 +0000 (12:46 +1000)]
Changed qlogging unittest to install subprogram

- Added install of app sub program so it works from install directory

Change-Id: Ia83643519752a3cbb59d6da2aed132d683a94bee
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoFixed qdir unittest rename() test to skip if run as root
Kurt Korbatits [Wed, 29 Feb 2012 23:06:13 +0000 (09:06 +1000)]
Fixed qdir unittest rename() test to skip if run as root

- subtest not valid if run as root so added a check and skip

Change-Id: Iae993e20f272f9303a75062ef00d22b49df5e84a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoQRegExp: fix \i \I \c \C \p \P escape sequences
Giuseppe D'Angelo [Wed, 29 Feb 2012 00:02:53 +0000 (00:02 +0000)]
QRegExp: fix \i \I \c \C \p \P escape sequences

Those escape sequences have a special meaning in the XML Schema 1.1
regular expressions, but not in Perl-compatible ones.

An escape sequence that has no special meaning should match the
escaped character itself; this patch fixes QRegExp's behaviour in
that regard (previously, it added a character class matching
nothing).

Change-Id: I983f923baa7c2ec19938b96353f3a205e6c06d58
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoSHA-2 code does not compile on FreeBSD
Holger Hans Peter Freyther [Wed, 29 Feb 2012 00:01:01 +0000 (01:01 +0100)]
SHA-2 code does not compile on FreeBSD

The code fails to compile with the below error:
qcryptographichash.cpp:55: error: conflicting declaration 'typedef quint64 uint64_t'
/usr/include/sys/types.h:99: error: 'uint64_t' has a previous declaration as 'typedef __uint64_t uint64_t'

FreeBSDs types.h defines the used defines. Maybe it would be less
ugly to switch the code to quint*, or use a define to do so, or to
have basic os detection for stdint.h, not to include sys/types.h.

Change-Id: Ic62ae4b742c1123b4b7e17158d216374e609f59f
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoAdd support for XCode 4 into qmake
Andy Shaw [Thu, 26 Jan 2012 21:36:42 +0000 (22:36 +0100)]
Add support for XCode 4 into qmake

This adds support for XCode 4 into qmake and also indirectly fixes a
couple of problems that are relevant for XCode 3.2 too

Task-number: QTBUG-17247
Change-Id: I722470ad1854bd740cbbd28ff4956057a0e1906b
Reviewed-by: David Forstenlechner <dforsten@gmail.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
(cherry picked from commit b5871311457ca97816c0abbb8b935570bbfb657c)
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoWindows - fix getsockopt calls for narrower than int options
Shane Kearns [Mon, 20 Feb 2012 18:48:10 +0000 (18:48 +0000)]
Windows - fix getsockopt calls for narrower than int options

Windows unhelpfully writes to only one byte of the output buffer
when getsockopt is called for a boolean option. Therefore we have
to zero initialise the int rather than initialising to -1 as was
done before.
This in general only works for little endian architecture, because
the word would look like 0x01000000 on big endian. So I have added
some compile time asserts in the assumption that windows is always
little endian. This is ok for comparisons with 0/false, but not
comparisons with true or nonzero values.
In the case of IPV6_V6ONLY, it is documented as DWORD (unsigned int)
but on some windows versions it is returned as a boolean triggering
the warning. I removed the warning, as the conversion to int works on
both LE and BE since it is only compared with zero.

Task-number: QTBUG-23488
Change-Id: I3c586d1ada76465fc045a82661f289920c657a4c
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
12 years agoRemove qhash_faster.
Robin Burchell [Tue, 28 Feb 2012 20:04:53 +0000 (21:04 +0100)]
Remove qhash_faster.

It's not faster under _any_ metric than the new algorithm, and it loses a lot of
spread which is a bad thing.

Change-Id: Ic87258f1c887822ffea1cb1517355564fabc3c26
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
12 years agoCopy Qt 4's QString hash algorithm.
Robin Burchell [Tue, 28 Feb 2012 19:56:14 +0000 (20:56 +0100)]
Copy Qt 4's QString hash algorithm.

We must do this the same way we do all other hash algorithms for fair
comparison, as otherwise, the call to the PLT unfairly penalises
QHash<QString>'s results, as it's in a different shared object.

Change-Id: I69c891f5a97dcccdfcfbdbf32796f86242a42963
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoMove data generation to initTestCase() method and store the results.
Robin Burchell [Tue, 28 Feb 2012 19:49:35 +0000 (20:49 +0100)]
Move data generation to initTestCase() method and store the results.

Per the comments on Ie4100a1ca4dbe7bf1cd73de883a9854377ac2f5e, having Q_ASSERT
was not a good idea, and data functions can't really handle
QVERIFY/QCOMPARE/etc, so do this in initTestCase instead.

Change-Id: I19e61dec7fe415bb1fa0f53a2920d99b8c7c8ea7
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
12 years agoAdd test data for string forms of numbers.
Robin Burchell [Tue, 28 Feb 2012 19:49:25 +0000 (20:49 +0100)]
Add test data for string forms of numbers.

Similar to the UUID benchmark, but won't have any non-numerical characters.

Change-Id: I7487c97cab96fd53c180fe12061e7be3ca96e883
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
12 years agoAdd a test using lots of similar strings.
Robin Burchell [Tue, 28 Feb 2012 19:49:19 +0000 (20:49 +0100)]
Add a test using lots of similar strings.

This attempts to emulate a dictionary usecase of sorts, done in code to avoid
bloating the git repository by adding an actual word list.

Change-Id: I878bc4af8877ba780ee699932f240c0d9c8ff12c
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
12 years agoDon't use deprecated QWheelEvent::delta()
Morten Johan Sorvig [Mon, 27 Feb 2012 12:03:47 +0000 (13:03 +0100)]
Don't use deprecated QWheelEvent::delta()

Replace with pixelDelta() and angleDelta().

Change-Id: Ie4b8b6fd39a5f8a28433554000940faef2f2542c
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoRemove Mac qDebug ifdefs.
Morten Johan Sorvig [Tue, 28 Feb 2012 11:37:55 +0000 (12:37 +0100)]
Remove Mac qDebug ifdefs.

Make qDebug work again with the new logging framework.

Change-Id: Ib88a83182429636b274d6284933d5ea00db7279c
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoRefactor the QPA dnd interface.
Friedemann Kleint [Wed, 22 Feb 2012 09:58:28 +0000 (10:58 +0100)]
Refactor the QPA dnd interface.

- Give QPlatformDrag a synchronous drag() function returning
  the Qt::DropAction
- Move the base functionality for asynchronous event handling
  to the platformsupport library as QBasicDrag (extendable base class
  handling drag icon and providing new virtuals)  and QSimpleDrag
  (sample implementation for drag within the Qt application).
- Change the Windows implementation accordingly.
- Change XCB to be based on QBasicDrag.
- Clean up QDragManager.

Change-Id: I654f76f0e55a385ba189bd74f3ceaded6a8fe318
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoQFileSystemModel autotest fixes
Miikka Heikkinen [Wed, 29 Feb 2012 13:21:24 +0000 (15:21 +0200)]
QFileSystemModel autotest fixes

For some reason, hiding files via executing "attrib +h filename"
process didn't work realiably, so changed the file hiding to be done
via Windows native API.

Also changed the test to use QTemporaryDir to simplify temporary
directory handling a bit.

Task-number: QTBUG-24291
Change-Id: I4f02b16e2f9105bcf5e6c5bf136f55434a26e2f4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agonetwork cookies: check "example.com" != "example.com."
Shane Kearns [Tue, 28 Feb 2012 14:53:42 +0000 (14:53 +0000)]
network cookies: check "example.com" != "example.com."

Only test code change, we already have the correct behaviour

Task-number: QTBUG-20001
Change-Id: I2296f405f47f9c8d15796e69f9d1854063e38d6a
Reviewed-by: Richard J. Moore <rich@kde.org>
12 years agoFix the include dir used by the CMake config files.
Stephen Kelly [Wed, 29 Feb 2012 16:00:04 +0000 (17:00 +0100)]
Fix the include dir used by the CMake config files.

I missed this one in 018e78575c6f7f5a90b41274468a26b09b909443

Change-Id: I194b96d2b1a64025ddb17fe2ed81566838555e13
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoRemove internal class QVolatileImage.
Laszlo Agocs [Wed, 29 Feb 2012 10:28:03 +0000 (12:28 +0200)]
Remove internal class QVolatileImage.

This made sense only for Symbian where there was a special
CFbsBitmap-based backend present and it was used from the
Symbian-specific VG and GL pixmap implementations.

The generic version is merely a useless wrapper over QImage and is not
in use anywhere in the codebase.

Change-Id: I1dabe22dfb8cbbc35dce8e22703a3aff810fb5f9
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoFix a double-release when loading NIB files
Jamie Kirkpatrick [Tue, 28 Feb 2012 15:22:49 +0000 (16:22 +0100)]
Fix a double-release when loading NIB files

Change-Id: I0c2c2a932b433a84e136da8e262739951a1d8c6e
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoMake QJsonPrivate::String compile on big endian platforms.
Jason Barron [Mon, 27 Feb 2012 21:19:39 +0000 (22:19 +0100)]
Make QJsonPrivate::String compile on big endian platforms.

Was missing a variable declaration and an explicit cast.

Change-Id: I4f0fb9c3d9b8472adf0d91036442adc1fe255c7e
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoFix tests of QMimeDatabase.
Friedemann Kleint [Fri, 24 Feb 2012 13:18:08 +0000 (14:18 +0100)]
Fix tests of QMimeDatabase.

- Use temporary directories to avoid instabilities
  due to remains of previous failed tests and locked
  directories.
- Replace SRCDIR by QFINDTESTDATA(), reference only
  the freedesktop.org.xml contained in the Qt source
  tree by $$QT.corelib.sources.
- Improve some error messages, test suite instructions
  for Windows.

Change-Id: Idee8e3767ef0a8299df3bdaaac20334164878db0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: David Faure <faure@kde.org>
12 years agoQPlatformTheme: Add virtual destructor.
Morten Johan Sorvig [Wed, 29 Feb 2012 13:20:11 +0000 (14:20 +0100)]
QPlatformTheme: Add virtual destructor.

Change-Id: I78aab57cc16ef4542bfb88c81dd6a9d8b4c4d853
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoSkip test tst_QTextScriptEngine::thaiWithZWJ on Windows.
Friedemann Kleint [Wed, 29 Feb 2012 07:31:41 +0000 (08:31 +0100)]
Skip test tst_QTextScriptEngine::thaiWithZWJ on Windows.

Change-Id: I9286ae8b1200b2d6638d1257a872450a9886fce0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
12 years agoFix build of QImageReader tests with QT_USE_QSTRINGBUILDER.
Stephen Kelly [Wed, 29 Feb 2012 11:50:23 +0000 (12:50 +0100)]
Fix build of QImageReader tests with QT_USE_QSTRINGBUILDER.

Change-Id: I789d99d0741bc178d2d7fd82558edc684eb6daf8
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoFix build of QWizard tests with QT_USE_QSTRINGBUILDER
Stephen Kelly [Wed, 29 Feb 2012 11:49:00 +0000 (12:49 +0100)]
Fix build of QWizard tests with QT_USE_QSTRINGBUILDER

Change-Id: Id276cdb9b84c61bf75a5bde149142f39f52f563e
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoRemove Mac/QPA collision breaking library linkage
Donald Carr [Thu, 23 Feb 2012 21:07:42 +0000 (21:07 +0000)]
Remove Mac/QPA collision breaking library linkage

Prior to this change, explicitly passing -qpa to configure breaks compilation on Mac. This is due to a false dichotomy between MAC/QPA

Change-Id: I52cacf96ae8d8d203787f9bbade417f2c55ab3f1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoAdded helpful notice in configure about how to enable the xcb plugin.
Samuel Rødal [Wed, 29 Feb 2012 07:34:57 +0000 (08:34 +0100)]
Added helpful notice in configure about how to enable the xcb plugin.

This should make it less confusing for people building Qt 5 on Linux.

Change-Id: I3aa7151f790587d5944c837d701b1b1b580b4bc3
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoCleaned up examples/opengl/cube/cube.pro, removed message()
Rohan McGovern [Tue, 28 Feb 2012 06:07:07 +0000 (16:07 +1000)]
Cleaned up examples/opengl/cube/cube.pro, removed message()

It's arbitrary and confusing to put a message(OpenGL support is enabled)
in this one OpenGL example and no others, especially since the message
is output during configure.

Change-Id: I7b55868d10c288f3459a7fda594fea1e6f45bf9a
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
12 years agoRemove unused selftest data file.
Jason McDonald [Tue, 28 Feb 2012 04:57:29 +0000 (14:57 +1000)]
Remove unused selftest data file.

The private git history shows that the test program associated with this
data file was missing from the original commit and was never
subsequently added.

Change-Id: I3401724ac04168158a48eb06436db83d3557711f
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoQHeaderView - remove sectionCount variable
Thorbjørn Lund Martsum [Mon, 27 Feb 2012 09:56:42 +0000 (10:56 +0100)]
QHeaderView - remove sectionCount variable

A previous patch ensures that we have exactly one section in a Span.
( see SHA : b800d8b94a7861ecf8853621f6556fca186fb5b7 )

Therefore we no longer need the sectionCount variable. We have
assess to it through the sectionSpan.count.  To keep this patch
quite simple the variable sectionCount has been changed to a
function returning the count value.

Change-Id: Ibc419eafa38ab64b08f93074cb6ae4b8518995f6
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoAdd support for QT_NO_SIGNALS_SLOTS_KEYWORDS
Stephen Kelly [Wed, 22 Feb 2012 15:36:52 +0000 (16:36 +0100)]
Add support for QT_NO_SIGNALS_SLOTS_KEYWORDS

QT_NO_KEYWORDS can be used for example to ensure that foreach can
not be used, but Q_FOREACH must be, that slots must not be used but
Q_SLOTS must be, etc.

Typically they are used to avoid symbol conflict with other
libraries that may use the same keywords (I think boost uses
signals).

For 3rd party libraries, it makes sense to use Q_SLOTS and Q_SIGNALS
instead of slots and signals, so that downstreams can still choose
to use QT_NO_KEYWORDS in their code.

The most convenient way to enforce that currently is to define
QT_NO_KEYWORDS when building the 3rd party library. However, that
has the inconvenient side effect of making foreach, forever and emit
not usable within the library implementation.

This patch makes it possible for the 3rd party library to use
QT_NO_SIGNALS_SLOTS_KEYWORDS to exclude signals and slots without
affecting whether the other keywords can be used in the library
implementation.

Change-Id: If1e16a4fa384bd3a2ddd737143499f8b587bc4f8
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
12 years agoQRingBuffer: make constructor explicit
Marc Mutz [Tue, 28 Feb 2012 21:52:41 +0000 (22:52 +0100)]
QRingBuffer: make constructor explicit

This is a private class, but it's so close to
the classical Stack(int) example for explicit
that I just have to make this ctor explicit,
too:

   QRingBuffer rb = 0; // oops: meant '*rb'

now no longer compiles.

Change-Id: I7d58c1f08c1b14d14930426159c5c8db71b4cf4d
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoActivate replacements when installing .pc files for win32
Hib Eris [Wed, 8 Feb 2012 12:52:01 +0000 (13:52 +0100)]
Activate replacements when installing .pc files for win32

Change-Id: Iaacbe8528bdbe1c1fca60ae8c94625e951f14554
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoQPair: don't copy-initialise 'first'/'second' in the default ctor
Marc Mutz [Tue, 28 Feb 2012 21:09:48 +0000 (22:09 +0100)]
QPair: don't copy-initialise 'first'/'second' in the default ctor

Why would we want copy-initialisation if we can
have the default constructor?

Change-Id: Id2de36d42ef9f63793ff4e3ec36202d3f2bf5f30
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoDe-duplicate platform-dependent paths
Hib Eris [Wed, 8 Feb 2012 15:13:42 +0000 (16:13 +0100)]
De-duplicate platform-dependent paths

Change-Id: Ifee9f05fc8d924877f24edfddb0dc5e324a29080
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoQPair: remove user-defined copy assignment operator
Marc Mutz [Tue, 28 Feb 2012 21:06:36 +0000 (22:06 +0100)]
QPair: remove user-defined copy assignment operator

The compiler-generated copy assignment operator is fine,
and the user-defined one prevents the compiler from
synthesising a move assignment operator.

Change-Id: I044104a2fd4d7522a910d5c2a68d11dabeca99c4
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoImplement missing replacements when installing .pc files for win32
Hib Eris [Wed, 8 Feb 2012 12:36:28 +0000 (13:36 +0100)]
Implement missing replacements when installing .pc files for win32

This implements replacements for win32 makefile generators similar
to the replacement functionality in unix makefile generators.

To enable Makefile code generation for replacements in win32 makefile
generators, you must set QMAKE_STREAM_EDITOR to e.g. sed.

When building for win32, sed is normally only available in the
mingw/msys build environment and when cross compiling on unix.
In these cases QMAKE_STREAM_EDITOR is set to sed in qmake.conf.

For other win32 build environments QMAKE_STREAM_EDITOR is not set
in qmake.conf and the replacements Makefile code is not generated.

Change-Id: Ie5de5d517eafaeaa2544f1e972aec3fe11d0a6f1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agodon't abuse $$fromfile() for inspecting entire projects
Oswald Buddenhagen [Tue, 21 Feb 2012 20:50:29 +0000 (21:50 +0100)]
don't abuse $$fromfile() for inspecting entire projects

a project can rightfully expect a sane environment. $$fromfile() does
not necessarily provide that. so instead use include() with a target
namespace.

Change-Id: I8d6d30ab1b760d4930c9b4453bc92f8f8ad0b0ae
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agolook for mkspecs in the project root, not next to every project
Oswald Buddenhagen [Thu, 23 Feb 2012 16:16:03 +0000 (17:16 +0100)]
look for mkspecs in the project root, not next to every project

qmake would look for mkspecs/ in the directory containing the current
project file. this makes completely no sense with recursive projects:
a) nobody would make per-project specs and b) specs meant to be global
would not be found.

consequently, we look for a project root when starting qmake and use
only that directory.
if .qmake.cache is found/set, we assume that to be the project root.
otherwise, we search for mkspecs/ the same way we search for the cache -
just to up until we find one or hit the root. if we are shadow-building,
search the build dir as well.

Change-Id: Ie66b189a40c21203d956e681cbef44a89f98cd17
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agofactor out code to install default mkspec
Oswald Buddenhagen [Fri, 24 Feb 2012 19:32:08 +0000 (20:32 +0100)]
factor out code to install default mkspec

Change-Id: I15f371df7bc24cd85c1c0924d1929da4dc3db16d
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>