profile/ivi/qtbase.git
11 years agoRelax QOpenGLContext::swapBuffers() conditions.
Samuel Rødal [Thu, 8 Nov 2012 12:32:07 +0000 (13:32 +0100)]
Relax QOpenGLContext::swapBuffers() conditions.

There's no need to force the context to be current and the correct FBO
to be bound when swapBuffers() is called, as this can easily be handled
on a per-platform basis.

Change-Id: I7af5a082d6a2b03dfa2cdc874c27617139a781a9
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
11 years agoAccessibility: Make accessibleInterface() in event virtual.
Frederik Gladhorn [Sun, 4 Nov 2012 09:32:41 +0000 (10:32 +0100)]
Accessibility: Make accessibleInterface() in event virtual.

This function can then be used by webkit in a different way.

Change-Id: I2e4c0570b5fc446114f63b3dc43e3c4505bcad79
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
11 years agoAccessibility: Warn if an event cannot create an interface for some reason.
Frederik Gladhorn [Sun, 4 Nov 2012 09:32:27 +0000 (10:32 +0100)]
Accessibility: Warn if an event cannot create an interface for some reason.

Change-Id: I87d0290286243f8ead114e238798c9a7b882d978
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
11 years agoRemove qSort usages from SSL code
Giuseppe D'Angelo [Thu, 1 Nov 2012 23:04:13 +0000 (00:04 +0100)]
Remove qSort usages from SSL code

Change-Id: Ie080cd3d0a6ac37fad625759946a71134c989c83
Reviewed-by: Richard J. Moore <rich@kde.org>
11 years agoRemove qSort usages from QDnsLookup
Giuseppe D'Angelo [Thu, 1 Nov 2012 22:40:59 +0000 (23:40 +0100)]
Remove qSort usages from QDnsLookup

Change-Id: I2f7dfcfdf13cdd85af5ba251478e10cafe7f649b
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
11 years agoFix TapAndHoldGesture (others) for QWidgets
Rafael Roquetto [Mon, 5 Nov 2012 23:18:02 +0000 (21:18 -0200)]
Fix TapAndHoldGesture (others) for QWidgets

After the migration to QPA, touch events usually have a QWindow as a receiver,
unlike Qt4 where receivers were QWidgets. This broke QGestureManager and
gestures such as the TapAndHoldGesture, because
QGestureManager::filterEvent(QWidget *, QEvent *) was never called. Since the
receivers are now of QWindow type, QGestureManager::filterEvent(QObject *,
QEvent *) gets called instead, always returning false. This has several side
effects, one of them was causing the TapAndHold gesture to time out, because
it never got a TouchEnd event (and thus it thought that the touch was still
going on, even though it was not). This patch ensures that if a gesture event is
meant to be delivered to a QWidget, the right event filter method is called.

Change-Id: I1df5f763fe6c4d8db0058adbd17d23d70b4988fe
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
11 years agoDo not call QWidget::show/hideEvent twice
Oliver Wolff [Wed, 17 Oct 2012 13:50:01 +0000 (15:50 +0200)]
Do not call QWidget::show/hideEvent twice

While handling events for Widgets and Windows in QWidgetWindow::event
makes sense for other events, it causes QWidget::show/hideEvent to be
called twice when handled like "the rest". Having that as one case here
seems to be the cleanest solution. Removing the call to showEvent from
QWidgetPrivate::show_helper (as proposed in the bug report) causes
autotests to fail and thus is not a viable option.

Additionally the expected result for the task221221 test for
QDoubleSpinBox was reverted to the Qt4 value as Qt4 behaviour was
restored.

Task-number: QTBUG-27199
Task-number: QTBUG-26424
Task-number: QTBUG-22565

Change-Id: I0ac42b09b1a7618de042d27aa5dd1b3d9f30f552
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
11 years agoTemporary backwards-compatible QWindow::setPos accessors
Shawn Rutledge [Thu, 8 Nov 2012 13:35:05 +0000 (14:35 +0100)]
Temporary backwards-compatible QWindow::setPos accessors

To be reverted after I19c00b54b1d2712f9418e8bcf56e35a8008b89ef and
and Ibd5cd10814c8cbd2b1f6e49b70782c7768d2366d are both integrated

Change-Id: I2e14d732cc7fc4168e8b4507a050f43f1e4c9e49
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoRemove QWindow pos, geometry and size as properties; pos->position
Shawn Rutledge [Mon, 22 Oct 2012 15:06:23 +0000 (17:06 +0200)]
Remove QWindow pos, geometry and size as properties; pos->position

Abbreviated properties are to be avoided.  But all 3 of these
properties are redundant from the QML perspective; and because QRect,
QPoint and QSize are (wisely) not QObjects, it's not possible to bind
to _their_ properties, which make these QWindow properties less useful
than users might assume that they are.

Change-Id: I19c00b54b1d2712f9418e8bcf56e35a8008b89ef
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoEnabled QSystemSemaphore autotest
Oliver Wolff [Wed, 7 Nov 2012 09:06:24 +0000 (10:06 +0100)]
Enabled QSystemSemaphore autotest

Change-Id: Id7133c46bbde554b2df69edacf9bfe808498a541
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoPrevent frame notifications going out when the content view is set
Andy Shaw [Wed, 7 Nov 2012 13:46:26 +0000 (14:46 +0100)]
Prevent frame notifications going out when the content view is set

When the content view is set it will trigger a frame notification which
we do not want to see because it would put our internal data on the
geometry out of sync. So ignore the notification until after it is set.

Change-Id: I704c2f186c8b0c6508a90d5dab51b7f6f02162fc
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agotest: Remove CONFIG += testcase from tst_bench_qnetworkreply_from_cache
Sergio Ahumada [Wed, 7 Nov 2012 19:48:59 +0000 (20:48 +0100)]
test: Remove CONFIG += testcase from tst_bench_qnetworkreply_from_cache

Benchmark tests are not supposed to be run by "make check"

Change-Id: I718565a8b4e71c136c7aa8f9bd95f95c5fdafab8
Reviewed-by: Rohan McGovern <rohan@mcgovern.id.au>
11 years agoTemporary backwards-compatibility window properties
Shawn Rutledge [Tue, 6 Nov 2012 22:57:20 +0000 (23:57 +0100)]
Temporary backwards-compatibility window properties

These are intended to exist only during the integration of patch
Ie4424ec15fbdef6b29b137f90a2ae33f173edd21, so that it will be possible
to build the other modules.  Then it will be reverted after the
property renaming is propagated to all the other modules.

Change-Id: I8d0c0774e685a728a98e8c866d95c606c927ff46
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoRename all QWindow properties that have "window" in them
Shawn Rutledge [Mon, 22 Oct 2012 10:47:34 +0000 (12:47 +0200)]
Rename all QWindow properties that have "window" in them

windowTitle, windowModality, windowIcon and so on are named that way
to be similar to the ones in QWidget.  However QQuickWindow inherits
all of the declared properties, and we would like to have shorter
property names in QML.  If you are working with a Window then it's
obvious the title property is the window title.  Unfortunately,
there must be patches in many other modules which depend on this one.
In order to avoid the need to merge them all at the same time,
there is also patch https://codereview.qt-project.org/#change,39001
which temporarily adds backwards-compatible accessors, which can be
removed after the other modules are able to build without them.

We should not rename windowState to state, because in QML, state
usually drives the state machine for animation transitions etc.
(although QWindow is not an Item, a user might get confused about it).

Related patches are
https://codereview.qt-project.org/#change,39001
https://codereview.qt-project.org/#change,37764
https://codereview.qt-project.org/#change,37765
https://codereview.qt-project.org/#change,37766
https://codereview.qt-project.org/#change,37762

Change-Id: Ie4424ec15fbdef6b29b137f90a2ae33f173edd21
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoRemove qSort/qStableSort usages from itemmodels
Giuseppe D'Angelo [Thu, 1 Nov 2012 22:35:03 +0000 (23:35 +0100)]
Remove qSort/qStableSort usages from itemmodels

Change-Id: I53c650f170fc8a6142373c1e7da0f4876188a39e
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agoUpdate dist/README file
Sergio Ahumada [Tue, 6 Nov 2012 20:08:02 +0000 (21:08 +0100)]
Update dist/README file

Task-number: QTBUG-26063
Change-Id: Ic9ebc02e352b7f0c4352be8b7de44c917135730f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoAdd configure option to minimize xcb runtime dependencies
Kai Koehne [Mon, 29 Oct 2012 11:59:09 +0000 (12:59 +0100)]
Add configure option to minimize xcb runtime dependencies

Some of the xcb- libraries we depend upon are not (yet) common across
distributions. This is problematic for binaries that should be working
on different distributions. The patch mitigates this by:

Adding the files from
  libxcb-proto (version 0.1.6), compiled with libxcb-1.5
  xcb-util (version 0.3.9)
  xcb-util-image (version 0.3.9)
  xcb-util-keysyms (version 0.3.9)
  xcb-util-renderutil (version 0.3.8)
  xcb-util-wm (version 0.3.9)

from xcb.freedesktop.org/dist to src/3rdparty/xcb.

Adding a configure option '-qt-xcb' to use the sources instead of
linking to the respective runtime libraries.

Task-number: QTBUG-27803
Change-Id: I6ea87daa382871b2b9072a601511523fa0b9f44b
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agofix warnings about empty "while" bodies
Oswald Buddenhagen [Wed, 7 Nov 2012 14:53:50 +0000 (15:53 +0100)]
fix warnings about empty "while" bodies

as it happens, this matches our coding style ...

Change-Id: I88d0916499a05a48d12691f5df5999c5ffd7a91c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agofix sign mismatch warnings
Oswald Buddenhagen [Wed, 7 Nov 2012 14:44:56 +0000 (15:44 +0100)]
fix sign mismatch warnings

enums are signed, while sizeof is unsigned.
as a side effect, we can optimize away one comparison by taking
advantage of the two's complement representation.

Change-Id: Ic0871306d30ad7217f2909e51e96a876a3f393dc
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agomove QSharedMemory autotest from qtscript to qtbase
Oliver Wolff [Mon, 29 Oct 2012 13:32:23 +0000 (14:32 +0100)]
move QSharedMemory autotest from qtscript to qtbase

As the script dependency for that autotest is not really needed it should
be moved to qtbase.

Task-number: QTBUG-27706

Change-Id: Ieda8b2182a20a77f53a0be9878e82e3236c79c2b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoRemove out-of-memory test in QVarLengthArray.
Christian Strømme [Wed, 10 Oct 2012 13:04:42 +0000 (15:04 +0200)]
Remove out-of-memory test in QVarLengthArray.

No reason to keep this test. If an application is trying to allocate too
much memory it will fail, and its the users responsibility to provide
sane values and catch exceptions to recover.

Task-number: QTBUG-27361

Change-Id: I29d71745ab791b6e8a76f7b1f866ff4bd7024749
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoFix autocapture for doubleclick in Windows
Miikka Heikkinen [Wed, 7 Nov 2012 13:04:37 +0000 (15:04 +0200)]
Fix autocapture for doubleclick in Windows

Holding down the second click of a doubleclick should also autocapture
the mouse like it does in Qt4.

Task-number: QTBUG-27863
Change-Id: I38c0567eca9fd7dcd3ef3d17921db5ebd3fe18b1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoqpa: Fix rendering issue in blitter engine (negative scaling factors)
Julien Brianceau [Wed, 7 Nov 2012 10:01:08 +0000 (11:01 +0100)]
qpa: Fix rendering issue in blitter engine (negative scaling factors)

A 180° rotation results in a TxScale QTransform with negative scaling
factors (x=-1.0 y=-1.0). This is not properly handled by blitter paint
engine yet, so use software rendering fallback in this case.

This rendering issue can be seen when using "-webkit-transform" CSS
property in WebKit with DirectFB QPA platform.

Change-Id: Iee496b6bf0c90ffe36c4235ceaa2c80f296b2ca4
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoconfigure: Pick up environment paths again on MinGW
Kai Koehne [Wed, 7 Nov 2012 11:14:33 +0000 (12:14 +0100)]
configure: Pick up environment paths again on MinGW

Make sure that INCLUDE, LIB paths are again considered in configure
checks on MinGW. While gcc itself doesn't care about the variables,
qmake automatically adds them via -I, -L...

This broke with 9c2ec72b95c13991f3.

Change-Id: Ic6214eeea9eb7c92961c37c3aa76c4fcaddb22b6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoFixed QSystemSemaphore autotest for "check" target
Oliver Wolff [Wed, 7 Nov 2012 09:05:06 +0000 (10:05 +0100)]
Fixed QSystemSemaphore autotest for "check" target

As CI runs autotests using the "check" target the approach using
DESTDIR = ../ does not work for the test. Instead the binaries are just
moved one directory up and QFINDTESTDATA is used to find the path of the
helper binary.

Change-Id: If1ed2b60821f1de4ac62f238c8af5e09cf0f444a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoRe-enable some skipped tests in tst_qwidget
Miikka Heikkinen [Wed, 7 Nov 2012 11:15:05 +0000 (13:15 +0200)]
Re-enable some skipped tests in tst_qwidget

Seems that these tests are now passing on Windows, so remove the skips.

Change-Id: Id30ef544502f97f8bc84f35f635e39912da3afe8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoFix sentences in QGraphicsItem documentation.
Mitch Curtis [Mon, 5 Nov 2012 09:35:31 +0000 (10:35 +0100)]
Fix sentences in QGraphicsItem documentation.

Change-Id: I5f86cdca53be103976017c83123e1ac80fcb8aa8
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoCocoa: fix backingstore flush for 10.8
Teemu Katajisto [Wed, 7 Nov 2012 10:23:46 +0000 (12:23 +0200)]
Cocoa: fix backingstore flush for 10.8

Remove compile time version check to make flushing work correctly
when building with other sdks than 10.8.

Task-number: QTBUG-27862

Change-Id: I915ae80017be1c03d5217aa9bdb60991603f8d01
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoExtend widget grab test.
Friedemann Kleint [Wed, 7 Nov 2012 09:04:53 +0000 (10:04 +0100)]
Extend widget grab test.

- Add enter/leave logging.
- Add button to enforce native widgets.
- Make mouse event logging more verbose.

Task-number: QTBUG-27800

Change-Id: I23160244bef6cb0b8d505cbf118cf12d91621fe7
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
11 years agoQGtkStyle: remove references to gtk_progress_configure()
J-P Nurmi [Tue, 6 Nov 2012 17:03:23 +0000 (18:03 +0100)]
QGtkStyle: remove references to gtk_progress_configure()

gtk_progress_configure() is deprecated and no longer exists in GTK3.

Change-Id: I02d58456285326b8aee6050da1a155cacbb86eee
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
11 years agoFix for compiling with clang with c++11.
Erik Verbruggen [Tue, 6 Nov 2012 09:09:28 +0000 (10:09 +0100)]
Fix for compiling with clang with c++11.

Change-Id: Ibb1e3290edbb2bdc68bb8164be6c484e49b9c69e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoDo not define QT_BASIC_ATOMIC_HAS_CONSTRUCTORS for clang.
Erik Verbruggen [Tue, 6 Nov 2012 10:22:16 +0000 (11:22 +0100)]
Do not define QT_BASIC_ATOMIC_HAS_CONSTRUCTORS for clang.

This triggers a bug in clang (before version 3.2). See also the bug
report: http://llvm.org/bugs/show_bug.cgi?id=12670 .

Change-Id: I9e0bc1cc39059ffa5e062652b932bc01e453ef98
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoFix excess enter events when showing modal dialog on button press
Miikka Heikkinen [Tue, 30 Oct 2012 13:54:43 +0000 (15:54 +0200)]
Fix excess enter events when showing modal dialog on button press

QApplicationPrivate::leaveAfterRelease was not properly cleared when
mouse event handling was interrupted by a modal dialog, which caused
every mouse move over the modal dialog to trigger enter event to the
widget under cursor.

Fixed by clearing QApplicationPrivate::leaveAfterRelease if mouse event
without any buttons pressed is handled.

Task-number: QTBUG-27643
Change-Id: I4f31daa656bc643c88e5338282a671ae2077e255
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoFix invalid mouse press and release events on window maximize
Miikka Heikkinen [Tue, 6 Nov 2012 11:56:18 +0000 (13:56 +0200)]
Fix invalid mouse press and release events on window maximize

In Windows, if the window is maximized with a doubleclick on the title
bar or resized with a doubleclick on the bottom or top frame border,
there comes no WM_LBUTTONDOWN or WM_LBUTTONDBLCLK event for the second
click, but there comes at least one WM_MOUSEMOVE with left button down
and eventual WM_LBUTTONUP.
Since QWindowSystemInterface::handleMouseEvent() can't differentiate
between actual button down event and a move event with button held
down, the move resulted in a button down event being sent to the widget
that was under cursor after resize.

Fixed by ignoring any events with left button down for which we didn't
get the initial native button down event. Since entering an application
with mouse button already held down is not generating mouse events
anyway until the button is released, this should be safe.

Task-number: QTBUG-27845
Change-Id: Ibc7abf8a127c401801e1b654a2829582f43a1ae8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoResolve xcb_poll_for_queued_event at run-time.
Samuel Rødal [Fri, 2 Nov 2012 14:08:25 +0000 (15:08 +0100)]
Resolve xcb_poll_for_queued_event at run-time.

By not making this a compile time decision we ensure forward
compatibility for older xcb versions if the xcb plugin is built against
a newer xcb.

Change-Id: I744777d53bf7b8deb6eff372494f4403d19d364c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
11 years agoMake it possible to suppress the automatic version number in DLLs
Thiago Macieira [Thu, 1 Nov 2012 21:57:33 +0000 (14:57 -0700)]
Make it possible to suppress the automatic version number in DLLs

qmake automatically appends the library's major version number to the
DLL file name on Windows, as DLL naming doesn't include the version
number on a suffix like on Unix systems.

This flag makes it so qmake skips adding. This will allow us to insert
Qt's major version number at a different position.

Change-Id: I25d471038841fb0c5a34ef6b3bd6266aa33cebd1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoFix for compiling with clang with c++11.
Erik Verbruggen [Tue, 6 Nov 2012 09:09:47 +0000 (10:09 +0100)]
Fix for compiling with clang with c++11.

Change-Id: I4f4928783d0e35b0df5e979fef1de80e9a026f55
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoCocoa: fix memory leaks
Teemu Katajisto [Mon, 22 Oct 2012 11:55:00 +0000 (14:55 +0300)]
Cocoa: fix memory leaks

Change-Id: I2e805aa64c65b90d33924ea4a8671735dee581fd
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoFix inconsistent leave/enter events for main window when popup is open
Miikka Heikkinen [Thu, 1 Nov 2012 09:28:16 +0000 (11:28 +0200)]
Fix inconsistent leave/enter events for main window when popup is open

Changed the platform leave event handling logic in QWidgetWindow to
match platform leave event handling logic in Qt4, where last mouse
receiver is used as leave target only if last mouse receiver wasn't
a native window itself. In that case it is assumed to get leave event
of its own when relevant.

Task-number: QTBUG-27639
Change-Id: Id6edcd29754a15c959f18ab38b20d66e5d446510
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
11 years agoMac: remove some unused code in QFontDialog
Liang Qi [Tue, 30 Oct 2012 12:46:50 +0000 (13:46 +0100)]
Mac: remove some unused code in QFontDialog

Those code was warpped by Q_WS_MAC and should be part of QPA already.

Change-Id: I48b751aad0509b50ccf9e82778c962ed80a2a9f9
Reviewed-by: Jiang Jiang <gzjjgod@gmail.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoAllow connect to functors with less parameters than the signal
Olivier Goffart [Sat, 3 Nov 2012 17:17:59 +0000 (18:17 +0100)]
Allow connect to functors with less parameters than the signal

Before, the functor slot (or lambda expression) had to have the same amount
of arguments as the signal.
This shown to be a big problem to be able to connect to signals that had
a QPrivateSlot.

This implementation use the type of the operator() of the functor to
know how many arguments we have.
As a bonus, we also can check the arguments in a static assert.

The test comes from https://codereview.qt-project.org/#change,38703
But this patch also works without variadic template

If the compiler does not support decltype, we workaround the lack of it
by using another level of indirection.

Change-Id: I9850b43e8caf77356a2ec3f4c0b0ed532d96029e
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agoDon't include qaccessible.h on QT_NO_ACCESSIBILITY
Kevin Funk [Tue, 6 Nov 2012 06:25:43 +0000 (07:25 +0100)]
Don't include qaccessible.h on QT_NO_ACCESSIBILITY

Change-Id: I1da4036c211172a72b73440648f4ff9ede761a69
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoSend QContexMenuEvent when Context Menu key is pressed.
Friedemann Kleint [Fri, 2 Nov 2012 10:59:14 +0000 (11:59 +0100)]
Send QContexMenuEvent when Context Menu key is pressed.

Bring back code from keymapper_x11.cpp.

Task-number: QTBUG-27648
Change-Id: I2a189a0537bcd2ae0eb093576c84814b2f09933b
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoImprove Direct X SDK detection in configure.exe
Friedemann Kleint [Fri, 2 Nov 2012 09:41:22 +0000 (10:41 +0100)]
Improve Direct X SDK detection in configure.exe

Check presence of Direct X SDK depending on
compiler version.

Check for presence of the headers d3dcompile.h and
intrin.h (SSE2) as well as d3d9.lib and the shader
compiler since the header d3dcompile.h is
also present in MinGW.

Change-Id: I7ee9701f4f9dc175ed2d733db79dda46de4d69f1
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
11 years agoDynamically resolve functions of dwmapi.dll.
Friedemann Kleint [Tue, 6 Nov 2012 08:25:13 +0000 (09:25 +0100)]
Dynamically resolve functions of dwmapi.dll.

The library is not present on Windows XP, for which /DELAYLOAD
is used in ANGLE. However, as this causes problems with MinGW,
use dynamic resolution.

Task-number: QTBUG-27741
Change-Id: Ie4a2706d57b751fbb6fc6f3e76ef2e8ddac3b892
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
11 years agoQGtkStyle: GTK3 compatible combo boxes
J-P Nurmi [Tue, 6 Nov 2012 15:03:45 +0000 (16:03 +0100)]
QGtkStyle: GTK3 compatible combo boxes

Use gtk_combo_box_new_with_entry when gtk_combo_box_entry_new is not
available. The latter was deprecated since 2.24 and is no longer
available in GTK3.

Notice that gtk_combo_box_new_with_entry returns a GtkComboBox, whereas
the old gtk_combo_box_entry_new returned a GtkComboBoxEntry.

Change-Id: I4aa3c528c6e04967ed783fce72036acb6063445b
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
11 years agoQGtkStyle: GTK3 compatible type checking
J-P Nurmi [Tue, 6 Nov 2012 13:04:21 +0000 (14:04 +0100)]
QGtkStyle: GTK3 compatible type checking

- GtkType -> GType
- GTK_CHECK_TYPE -> G_TYPE_CHECK_INSTANCE_TYPE

Both are deprecated aliases in GTK2 and do not exist in GTK3.

Change-Id: If2dc4ba09451cabb6730f8b23e15db7554a9f829
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
11 years agoQGtkStyle: handle focus & default widgets in GTK3 compatible way
J-P Nurmi [Wed, 10 Oct 2012 16:39:51 +0000 (18:39 +0200)]
QGtkStyle: handle focus & default widgets in GTK3 compatible way

Change-Id: Ib4409c15599953a6626738543b27d14d711e7109
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
11 years agoMake test class name consistent with file name.
Frederik Gladhorn [Sun, 28 Oct 2012 09:36:58 +0000 (10:36 +0100)]
Make test class name consistent with file name.

Change-Id: I2b0e7068d7476673981c7c7f03012db8eabc8ee2
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
11 years agoDe-inline some destructors in QtWidgets
Marc Mutz [Mon, 22 Oct 2012 06:30:32 +0000 (08:30 +0200)]
De-inline some destructors in QtWidgets

Destructors should be out-of-line so that the compiler doesn't generate
one per translation unit.

Apart from creating more work for the compiler, it can also lead to
duplicated vtables if the dtor is the first virtual function
(reimplementation), and all other virtuals are inline, too.
Duplicate vtables then break RTTI.

In addition, having virtual dtors de-inlined allows us to add code
to them in a BC way.

As a final argument, this change may lead to less code app-side, since
a sequence of cross-DLL calls (to member variable dtors) is replaced
by a single cross-DLL call to the new out-of-line dtor.

Change-Id: Ifb8c4aa992c75d61ba9ac8de5ab41d1e96b0a0b1
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
11 years agoFix native RGB text on OpenGL ES 2 without BGRA extension
Eskil Abrahamsen Blomfeldt [Tue, 6 Nov 2012 11:22:39 +0000 (12:22 +0100)]
Fix native RGB text on OpenGL ES 2 without BGRA extension

Angle, for instance, which is now the default on Windows,
does not support the GL_BGRA_EXT format as input for
glTexSubImage2D(). In the case where it's not detected, we
therefore need to flip the bytes in the input.

Change-Id: Ibe78d0223e3c2c39cb1943cdcf67103044d00aa7
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoFix connection to const slots (or from const signals)
Olivier Goffart [Thu, 12 Jan 2012 19:46:15 +0000 (20:46 +0100)]
Fix connection to const slots (or from const signals)

Pointer to const member function have a different signature, and hence
need their own traits code.

Change-Id: Ie4b2434a412f412444fb07ef1388a37cab105ecd
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agoAdd OOM unit test for QVarLengthArray
Peter Kümmel [Wed, 10 Oct 2012 18:08:10 +0000 (20:08 +0200)]
Add OOM unit test for QVarLengthArray

Change-Id: Idf22ee6747aca8f0322e68b71f2c32e9ea562d4c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Jason McDonald <macadder1@gmail.com>
11 years agoFix QAccessible to build when QT_NO_ACCESSIBILITY is defined
J-P Nurmi [Fri, 2 Nov 2012 16:13:32 +0000 (17:13 +0100)]
Fix QAccessible to build when QT_NO_ACCESSIBILITY is defined

Change-Id: I6104633cdc80425b8f4697acd28c9a156cd0d76f
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
11 years agoQGtkPainter: use gtk_widget_get_style()
J-P Nurmi [Mon, 5 Nov 2012 14:47:21 +0000 (15:47 +0100)]
QGtkPainter: use gtk_widget_get_style()

Do not access GtkWidget::style directly, it doesn't exist in GTK3.

Change-Id: I1ee4ad5ca0894c9277219fc2a70f5f1c69ec632f
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
11 years agoAccessibility: clean up and simplify test
Frederik Gladhorn [Fri, 19 Oct 2012 17:32:13 +0000 (19:32 +0200)]
Accessibility: clean up and simplify test

We don't need to define pi.
Use some clearer names in navigateHierarchy.
Use smart pointers.

Change-Id: I482efe9235a3419f048baede6886d29d46e3057c
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
11 years agoAccessibility: clean up test
Frederik Gladhorn [Fri, 19 Oct 2012 17:11:40 +0000 (19:11 +0200)]
Accessibility: clean up test

Use smart pointers.
Navigation to siblings is long gone.

Change-Id: I81a10633960eefb9738990682734dcfbdd65330c
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
11 years agoconfigure: Fix key prompt handling.
Friedemann Kleint [Thu, 1 Nov 2012 11:53:24 +0000 (12:53 +0100)]
configure: Fix key prompt handling.

- Introduce function for key prompt for usage in
  verifyConfiguration() and showLicense().
- Prompt only once in  verifyConfiguration().

Change-Id: I7028da1bda703a424e39477bd06b2639475739a4
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
11 years agoconfigure: Use forward slashes in findFile-functions consistently.
Friedemann Kleint [Mon, 5 Nov 2012 14:21:52 +0000 (15:21 +0100)]
configure: Use forward slashes in findFile-functions consistently.

Convert to native where required.

Change-Id: I11ff99ff9921bc470ebd804944e3b0773d49387c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoImprove path search in configure.
Friedemann Kleint [Thu, 1 Nov 2012 13:31:16 +0000 (14:31 +0100)]
Improve path search in configure.

- Remove duplicated code locateFile/locateFileInPaths.
- Move basic path search functionality to Environment.
- Add functions for headerPaths/libraryPaths to  Environment.
- Use QStandardPaths::findExecutable().
- Replace Environment::detectExecutable by
  QStandardPaths::findExecutable().
- Introduce static path lists in findFile() to avoid
  repeated directory scans

Change-Id: I9b93066a3de65f40527780d6ddf7989bca35cd04
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoFix hellowindow example generating excess timers
Miikka Heikkinen [Mon, 5 Nov 2012 11:51:54 +0000 (13:51 +0200)]
Fix hellowindow example generating excess timers

The example was creating a new timer on every expose event, which
quickly leads into massive excess of timeout signals.

Fixed by only creating one timer.

Task-number: QTBUG-27836
Change-Id: Ia6ed1bd9575e296f4c6c5b12509095e4d5c016dd
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoFix GDI leaks in fontengine
Miikka Heikkinen [Mon, 5 Nov 2012 11:00:34 +0000 (13:00 +0200)]
Fix GDI leaks in fontengine

GDI objects that are created need to be deleted once no longer needed,
instead of just released.

Task-number: QTBUG-27812
Task-number: QTBUG-27825
Change-Id: I53b04b54cea9e2aaa8fc72365c215f516c5682e6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoFix "-no-opengl" configuration in Windows
Miikka Heikkinen [Mon, 5 Nov 2012 09:48:07 +0000 (11:48 +0200)]
Fix "-no-opengl" configuration in Windows

"-no-opengl" didn't clear the default value for "OPENGL_ES_2", which
meant "opengles2" got configured in.

Task-number: QTBUG-27840
Change-Id: Id7b8e3e268571d820bebfb3700d3961ec96be7fd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoQWindowsVistaStyle: Restore altered brush origin.
Friedemann Kleint [Mon, 5 Nov 2012 09:31:52 +0000 (10:31 +0100)]
QWindowsVistaStyle: Restore altered brush origin.

The line to restore it was missing, and the leftover variable
caused a warning, which was removed in
abe5a0a432116963d22c4ef501a4dfd2393d66fb .

Task-number: QTBUG-27828

Change-Id: I00b8b89b07bec38a1660c3a9c61220b6d0d7eb48
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
11 years agoQtWidgets: add some explicit
Marc Mutz [Mon, 22 Oct 2012 06:24:53 +0000 (08:24 +0200)]
QtWidgets: add some explicit

Change-Id: I0650db3d47b506c67074c526ab9857f8159fd599
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoDoc fixes.
Frederik Gladhorn [Thu, 20 Sep 2012 15:51:53 +0000 (17:51 +0200)]
Doc fixes.

Change-Id: Id2042c33a9762261756d1065781005dfef341797
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoImplement editable text interface for QLineEdit.
Frederik Gladhorn [Thu, 18 Oct 2012 14:59:08 +0000 (16:59 +0200)]
Implement editable text interface for QLineEdit.

This was uncovered by the linux accessibility test which
tried to call non-existing functions.

Change-Id: Iaa9640c23ee77d7c5b2321d7f8cfa6d12d61c0e9
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
11 years agoQTscii and QIscii are not big codecs
Peter Kümmel [Tue, 23 Oct 2012 07:03:15 +0000 (09:03 +0200)]
QTscii and QIscii are not big codecs

This fixes the build when QT_NO_BIG_CODECS is defined.

Change-Id: I832fb8ba5df6c4a6c1db9bdaecc498690357a56a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agotest: Remove some QSKIP's from tst_QStyle
Sergio Ahumada [Sun, 21 Oct 2012 19:49:43 +0000 (21:49 +0200)]
test: Remove some QSKIP's from tst_QStyle

Change-Id: Ic277889a75871a8bf72ab2eb2b97e6deeed498e9
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
11 years agoFix conditional jump based on an uninitialized variable.
Jędrzej Nowacki [Fri, 2 Nov 2012 12:59:04 +0000 (13:59 +0100)]
Fix conditional jump based on an uninitialized variable.

Valgrind warns about the jump in qfontconfigdatabase.cpp:522 based on
uint QFondDef::hintingPreference:2 property. Surprising thing is that
the property is initialized in the default constructor, so there should
not be an issue.

The warning disappear if the property is _not_ placed on a boundary of a
two words, or if bit field is fully initialized. So I suspect that only
one bit of the two was initialized properly.

I decide to implement both solutions because of a potential minor
performance improvement, during reading the property.

I still fail to say why the value was uninitialized, I believe that this
patch simply workarounds gcc bug or valgrind bug.

Change-Id: I2e87738f66a435ef6e30b3d2db6baa73da025426
Reviewed-by: Jiang Jiang <gzjjgod@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
11 years agoImprove QByteDataBuffer::read() performance with partial reads
Antti Harju [Wed, 24 Oct 2012 07:56:46 +0000 (10:56 +0300)]
Improve QByteDataBuffer::read() performance with partial reads

Add a read position variable to eliminate excessive memcpy'ing when
reading a partial buffer.

Specifically, fix performance issue of reading large files from
QNetworkDiskCache in QtWebKit2.

Task-number: QTBUG-27522
Change-Id: I21edc909bf9223971b2c3db5f1fa6b89c5b61c5f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Antti Harju <antti.harju@ixonos.com>
11 years agoAngle: Make it call the correct host tools
Yuchen Deng [Sun, 28 Oct 2012 09:53:51 +0000 (17:53 +0800)]
Angle: Make it call the correct host tools

Change-Id: Ib5a0da0ac50e0d2abebc825d6d6105ad5d84acd8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Jason Barron <jason.barron@digia.com>
11 years agoMake QGLWidget::paintGL() call glClear().
Morten Johan Sorvig [Tue, 23 Oct 2012 09:31:48 +0000 (11:31 +0200)]
Make QGLWidget::paintGL() call glClear().

Creating and displaying a plain QGLWidget on Mac would
display "garbage" or previous frame buffer content
on screen. This looks broken and raises interesting
privacy concerns.

Fix by adding a call to glClear().

Change-Id: I507c24275e41fac0be5f518c5a70d151099ae6b8
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoCocoa: make text subpixel rendering check to work for non-Apple displays
Teemu Katajisto [Mon, 29 Oct 2012 10:54:17 +0000 (12:54 +0200)]
Cocoa: make text subpixel rendering check to work for non-Apple displays

Task-number: QTBUG-27386

Change-Id: I4e12663f80060dfcea6970a705861af388d816ac
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoQIdentityProxyModel: fix sibling() reimplementation
Mark Brand [Fri, 2 Nov 2012 20:49:44 +0000 (21:49 +0100)]
QIdentityProxyModel: fix sibling() reimplementation

The previously missing mapFromSource() sets the proxy model in the
returned index. Otherwise, the returned index refers incorrectly to
the source model.

Follow-up to 9dfba89c28bbff3316cb7aed6c07f90c0f2d5a22.

Change-Id: I78ab9183820909b646a7333f28aa5ec7266fa675
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agoUpdate mac-specific code in qtestlib for Qt5
Liang Qi [Mon, 9 Jul 2012 11:00:45 +0000 (13:00 +0200)]
Update mac-specific code in qtestlib for Qt5

1. Remove the code for activate application, due to Qt 5 already
has this feature
2. Update the code for power setting

Task-number: QTBUG-23267

Change-Id: Id257c2e10e8e750a4b68cd2995c2ac4b70f8910c
Reviewed-by: Jiang Jiang <gzjjgod@gmail.com>
Reviewed-by: Liang Qi <liang.qi@digia.com>
11 years agoQt 5.0 QTreeView. Prevent manual moving of the first section
Thorbjørn Lund Martsum [Tue, 30 Oct 2012 14:25:02 +0000 (15:25 +0100)]
Qt 5.0 QTreeView. Prevent manual moving of the first section

This prevents the user of moving the leftmost column.

There will be no API to allow move of the tree-structure.
It is very weird to do that, so it shouldn't be a problem.

In case it is a big problem somewhere it can be hacked with:
QTableView unused;
unused.setVerticalHeader(tree->header());
tree->header()->setParent(tree);
unused.setVerticalHeader(new QHeaderView(Qt::Horizontal));

Task-number: QTBUG-332

Change-Id: I3a251c8d0fd472ec0ad7edb20a7f3e00af7e0da8
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agoMac: refactor scrollbar animations
J-P Nurmi [Tue, 30 Oct 2012 12:47:20 +0000 (13:47 +0100)]
Mac: refactor scrollbar animations

Get rid of QWidget-centric QMacStyle::eventFilter() and implement the
fade out animations for scrollbars using QNumberStyleAnimation-based
QFadeOutAnimation.

Change-Id: I2000fa50d46b153e981ceafc12a53932a196382e
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
11 years agoMake it possible to use mini and small size on mac without widget
Jens Bache-Wiig [Fri, 2 Nov 2012 17:35:15 +0000 (18:35 +0100)]
Make it possible to use mini and small size on mac without widget

We need to add the styleoption when evaluating the small and
mini size hints.

Change-Id: I00f8709912aa2202caef4dbdeaebb5d67cc9a9b4
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
11 years agoReview of documentation.
Michele Caini [Tue, 23 Oct 2012 20:39:35 +0000 (22:39 +0200)]
Review of documentation.

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

Change-Id: I13241a3b4c16d2cb1b24f80fe26832467621923a
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
11 years agoMake it obvious that adding a QLayout to QSplitter is not supported.
Mitch Curtis [Fri, 2 Nov 2012 16:19:59 +0000 (17:19 +0100)]
Make it obvious that adding a QLayout to QSplitter is not supported.

It does not make sense to add a QLayout to a QSplitter, since the
splitter manages its child widgets in the same manner as a QLayout.
The result of doing so is that the child widgets inside that layout
will lead to the splitter and the layout fighting to position the child
widgets.

QSplitter::addWidget should be used to add widgets directly to the
splitter instead.

Change-Id: I640b463cae8673f87354d28636bff4dd3cfb9679
Reviewed-by: Samu Voutilainen <samu.voutilainen@gmail.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoxcb: Fix a trivial reply leak
Uli Schlachter [Thu, 1 Nov 2012 18:25:55 +0000 (19:25 +0100)]
xcb: Fix a trivial reply leak

Change-Id: Ib9a0f96007e6dc5e125bfcd39bd1ef09baebae3b
Signed-off-by: Uli Schlachter <psychon@znc.in>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoxcb: Fix a colormap leak
Uli Schlachter [Thu, 1 Nov 2012 18:22:18 +0000 (19:22 +0100)]
xcb: Fix a colormap leak

The function createDummyWindow() allocated a colormap, but never freed
it. Freeing it is safe after the window is created.

Change-Id: I4c876568572c9e1e9dde7047850a51917ef3702f
Signed-off-by: Uli Schlachter <psychon@znc.in>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoXCB: Handle connection errors
Uli Schlachter [Thu, 1 Nov 2012 17:40:37 +0000 (18:40 +0100)]
XCB: Handle connection errors

When the XCB connection breaks, all following XCB function calls will fail and
function calls that are currently in progress will return. This means that
xcb_wait_for_event() will return NULL and thus the QXcbEventReader thread will
exit.

This patch uses the above behavior to make sure that processXcbEvents() will be
called. The error handling should always be done before normal event processing,
because all XCB calls will fail once the connection is in an error state. This
is especially unexpected for xcb_get_setup() which suddenly returns a NULL
pointer.

Task-number: QTBUG-27686

Change-Id: Ie3e4058f9d92bcbfc45934a8b36d9a7254e2b4bb
Signed-off-by: Uli Schlachter <psychon@znc.in>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoQTranslator: Use resource memory instead of copying it
Thomas McGuire [Mon, 29 Oct 2012 16:14:07 +0000 (17:14 +0100)]
QTranslator: Use resource memory instead of copying it

Previously, translations in resource files were loaded through
QFile and the data was copied. Now, simply use the resource memory
in-place.

Change-Id: I55a06c1e7bb15c169cc69b908b3021136beac9d2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoFix progressbar animation on macstyle
Jens Bache-Wiig [Fri, 2 Nov 2012 13:18:54 +0000 (14:18 +0100)]
Fix progressbar animation on macstyle

The animation is not just supposed to run when indeterminate, but
also while it is progressing.

Change-Id: If176bd230c2f6f83781e01ea77526c24d54c8477
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
11 years agodon't return false from removeTranslator() just because of shutting down
Oswald Buddenhagen [Thu, 1 Nov 2012 16:50:44 +0000 (17:50 +0100)]
don't return false from removeTranslator() just because of shutting down

the condition is supposed to suppress the event emission, not to trash
the return value.

Change-Id: I3e327ceedb909ac29ba975c49b0f039b50eb4ee1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agodo not add DEPENDPATH to VPATH
Oswald Buddenhagen [Thu, 1 Nov 2012 13:50:03 +0000 (14:50 +0100)]
do not add DEPENDPATH to VPATH

DEPENDPATH merely says where to look for impliciit dependencies, not
where to find explicit ones.

fwiw, the other way round may be considered correct, but DEPENDPATH
exists for the sole purpose of limiting which paths should cause
recompilations, so it would be counterproductive to extend with with
VPATH.

Task-number: QTBUG-11912
Change-Id: I86450b5fd5aeb1f1b015b53f0adcd167ff4ce04d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agodon't unset TARGET_VERSION_EXT
Oswald Buddenhagen [Thu, 1 Nov 2012 13:41:49 +0000 (14:41 +0100)]
don't unset TARGET_VERSION_EXT

otherwise we may remove a user-provided setting.

Change-Id: If3217a3d92938fe2f3ac3740a645d3ace0ce9ab0
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoFix height of combobox in macstyle without a widget
Jens Bache-Wiig [Fri, 2 Nov 2012 13:27:09 +0000 (14:27 +0100)]
Fix height of combobox in macstyle without a widget

When no widget is provided we hardcode the height and the value
was off by 2. There is no change when a widget is provided.

Change-Id: I555b5206b8750db06595a1e2572a3f8212635a9d
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
11 years agofix cleanup of QWinIoCompletionPort
Joerg Bornemann [Thu, 1 Nov 2012 13:57:27 +0000 (14:57 +0100)]
fix cleanup of QWinIoCompletionPort

The QWinIoCompletionPort thread was never properly cleaned up.
Maintain a reference count for QWinIoCompletionPort and create/destroy
it on demand.

Change-Id: I607b574484554dd3ad107dfb43b0a248bcf8b7a4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agomove QT_NAMESPACE define to qtcore's module pri file
Oswald Buddenhagen [Thu, 1 Nov 2012 13:23:41 +0000 (14:23 +0100)]
move QT_NAMESPACE define to qtcore's module pri file

it's basically an attribute of qtcore (and everything that depends on it).

Change-Id: I6eeefeb5df70764399d9f22dca9dbec1843b8d68
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agolet winmain just use qtcore
Oswald Buddenhagen [Thu, 1 Nov 2012 13:23:47 +0000 (14:23 +0100)]
let winmain just use qtcore

this is correct dependency-wise (anything which links to this needs to
link qtcore), and just cleaner.

Change-Id: I2c49d16fc8a0ee8bc55a3c165993fd1c4e313dab
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agomove invariant CONFIG flags out of the configures
Oswald Buddenhagen [Tue, 23 Oct 2012 19:06:08 +0000 (21:06 +0200)]
move invariant CONFIG flags out of the configures

we now have qt_build_config.prf which can contain static code.

Change-Id: I3f0ae142fdc5ffb4e1d25e628e809ba15b5f0ac4
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoremove pointless messing with CONFIG+=fix_output_dirs
Oswald Buddenhagen [Tue, 23 Oct 2012 18:52:09 +0000 (20:52 +0200)]
remove pointless messing with CONFIG+=fix_output_dirs

the function is automatically performed by debug_and_release.prf,
regardless what we do with this flag.

Change-Id: Iddec69b35e0e905fdf4133ee240af37d3a8ada0b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoQNX: Fix build with QNX SDP 6.5.
Sergio Martins [Fri, 2 Nov 2012 11:48:49 +0000 (11:48 +0000)]
QNX: Fix build with QNX SDP 6.5.

__EXT_LF64SRC isn't defined in this case.

This also makes it consistent with mkspecs/common/posix/qplatformdefs.h
which uses QT_USE_XOPEN_LFS_EXTENSIONS and QT_LARGEFILE_SUPPORT
to decide which type of stat struct to declare.

Change-Id: Iaa155acc270783901376b543fdeffb5263294754
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
11 years agoBlackberry: Fix QCoreApplication::applicationFilePath() performance.
Sergio Martins [Thu, 25 Oct 2012 16:50:47 +0000 (17:50 +0100)]
Blackberry: Fix QCoreApplication::applicationFilePath() performance.

Listing all files with QDir is slow.
Instead, use argv[0] for zygotized apps and _cmdname() for
non-zygotized.

Apps run through the terminal will fall in the zygotized case,
which is ok.

Note about zygotized apps:
  Zygotized apps don't have an executable, they live in a shared
  object file.

  These apps are run through a deamon that forks and dlopens()
  the shared object ( for performance reasons ).

  For this reason we can't use _cmdname(), since it just contains
  the the file path of the daemon.

  On the other hand, non-zygotized apps have a bogus argv[0]
  when run through the navigator ( command line is fine ).

Change-Id: I9953e8fa05c9fb11c33b3a38ebab00fe33ba4c44
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
11 years agoQHeaderView 5.0 - correct drop on manual QHeaderView sectionmove
Thorbjørn Lund Martsum [Thu, 1 Nov 2012 15:33:25 +0000 (16:33 +0100)]
QHeaderView 5.0 - correct drop on manual QHeaderView sectionmove

This fixes an error in the calculation of the exact drop position
when an user is moving a section in QHeaderView.

Before we compared a mouse-position local to the widget
(pos) with a summed length of sections (posThreshold).

However we need to consider/substract the headers offset to make
the posThreshold comparable to the local mouse position.

This solves e.g.
Task-number: QTBUG-14814

Change-Id: If0281cf0c7b98316474f18e8eaa32c6d062dda56
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agoQHeaderView - call invalidateCachedSizeHint() on clear
Thorbjørn Lund Martsum [Thu, 1 Nov 2012 06:29:12 +0000 (07:29 +0100)]
QHeaderView - call invalidateCachedSizeHint() on clear

This calls invalidateCachedSizeHint on clear, which is a logical
thing to do.

Task-number: QTBUG-22528
Change-Id: I0befb2d492599fa8a05b1c2162bbca586e1b019d
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agoAdd implementations of QAIM::sibling in public APIs.
Stephen Kelly [Wed, 26 Sep 2012 16:16:08 +0000 (18:16 +0200)]
Add implementations of QAIM::sibling in public APIs.

Change-Id: I2248641f2ed8735c28bd9572470520995a4a5b62
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>