Giuseppe D'Angelo [Mon, 2 Jul 2012 08:01:56 +0000 (09:01 +0100)]
More qHash(T, uint) support
Add the seed to QPair, QUuid, QPersistentModelIndex's qHash(), and fix
qHash documentation for them and for many other datatypes.
Change-Id: I1386f3ed42ee1a832371a242ee5c82895ba92c2b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Lars Knoll [Fri, 20 Jul 2012 07:05:47 +0000 (09:05 +0200)]
Move the windows locale codec into it's own file
Simple cleanup, that will make it easier to refactor
the code to use ICU.
Change-Id: I7486f36d27b8c521cf970327eb94b2236338d4ec
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Laszlo Agocs [Sat, 21 Jul 2012 11:20:33 +0000 (14:20 +0300)]
Add basic backingstore implementation to kms
This allows using the kms plugin in QWidget apps having a single
(preferably fullscreen) top-level widget.
Based on eglfs' implementation. Dirty rectangle tracking is missing,
should be added later.
There is no composition so multiple TLWs will not work nicely.
Change-Id: Ia78589d1a375925ebdcc46aa20fc1619ec14d6cc
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Elvis Lee <kwangwoong.lee@lge.com>
Mitch Curtis [Mon, 23 Jul 2012 10:13:32 +0000 (12:13 +0200)]
Clarify ambiguous sentence in QVariant::toBool() documentation.
Task-number: QTBUG-26482
Change-Id: Id9158ba1f7ffa5af169f808aed4559f7a0470e20
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Jan-Arve Saether [Fri, 20 Jul 2012 14:11:45 +0000 (16:11 +0200)]
If the GL driver is singlebuffered, reflect that in QSurfaceFormat
Change-Id: Iafed64d0a35f8d49357f147c8b7b4c0e9f4b9173
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Jan-Arve Saether [Fri, 20 Jul 2012 14:11:45 +0000 (16:11 +0200)]
If swapBehavior is TripleBuffer, set WGL_DOUBLE_BUFFER_ARB to TRUE
Previously, if the drivers' swap behaviour was single-buffered
it would fallthrough (just like DefaultSwapBehavior) and remain
single-buffered.
Change-Id: I4b93ad7a49094aa992d0b8fb3429c163bbbf655d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Friedemann Kleint [Mon, 23 Jul 2012 14:56:11 +0000 (16:56 +0200)]
WindowSystemInterface::sendWindowSystemEvents(): Remove unused parameter.
No need to pass the dispatcher. Get rid of Windows logic to maintain
a stack of dispatcher associated with flags.
Change-Id: Ic2daad4b6762a46fac3274937effc188af436c9a
Reviewed-by: David Faure <faure@kde.org>
Sean Harmer [Wed, 18 Jul 2012 12:12:46 +0000 (13:12 +0100)]
Improve the loading performance of QLibrary
If an absolute path is specified we try that first. Otherwise we first
try the most likely system-specific format (e.g. libfoo.so) on Unix.
This improves performance especially on systems with slow flash devices.
For example, prior to this commit loading the Xcursor library (in the
xcb plugin) results in attempts to dlopen:
"Xcursor"
"Xcursor.so.1"
"libXcursor"
"libXcursor.so.1"
With this commit this is reduced to a single attempt of:
"libXcursor.so.1"
Plugin loading uses absolute paths with QLibrary so there is no
performance penalty for plugins with this commit.
This is however a behavioural change with respect to Qt4 but one
that I believe is justified and wanted.
Change-Id: I7813afa335f9bf515e87934c2f8f97888818c69c
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Sean Harmer [Sat, 21 Jul 2012 07:38:25 +0000 (08:38 +0100)]
XCB: Record the OpenGL profile in the format
Change-Id: I68f9e78e15fc798ec801feed74e0cb900ef577ae
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Sean Harmer [Mon, 23 Jul 2012 12:45:21 +0000 (13:45 +0100)]
QNX: Use new native event filtering api
Change-Id: Iaf25697e6250ad29085647db4b8e50e274599227
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: David Faure <faure@kde.org>
Stephen Kelly [Sun, 22 Jul 2012 19:31:26 +0000 (21:31 +0200)]
Quote the SONAME properly.
It does not make a big difference, but it is what was intended
initially.
Change-Id: Idd7e06c857533030b000726ff87b48bb2619df06
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Marc Mutz [Fri, 20 Jul 2012 09:22:00 +0000 (11:22 +0200)]
QPaintBuffer: use the nullary version of qRegisterMetaTypeStreamOperators()
The name is taken from the existing Q_DECLARE_METATYPE()s.
Also don't call qRegisterMetaType<>, as that is done within
qRegisterMetaTypeStreamOperators<> already.
Change-Id: Ia782868b49bc97d78e0cec29ef9f8b5709420e2a
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Marc Mutz [Fri, 20 Jul 2012 15:36:30 +0000 (17:36 +0200)]
QStyleFactory: remove unused typedef (GCC 4.8 warning)
Change-Id: I50ef91f4df3cdf1ae039dce269e37185eece6b8d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Stephen Kelly [Fri, 13 Jul 2012 18:19:15 +0000 (20:19 +0200)]
Split QWidgetsVariant tests into a separate testcase.
This allows building the QVariant tests without the QtWidgets module.
Change-Id: I7cd7e78a60c7bc7614ec16df1abe1e93e45d4923
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Stephen Kelly [Mon, 23 Jul 2012 14:35:58 +0000 (16:35 +0200)]
Create CMake files conditionally on the internal_module CONFIG option.
This includes a revert of
195df6e8e0ffb2636cfe395f560eb73c05a54b61
so that the solution scales better to other Qt modules, and other
logic related to 'internal' modules.
Change-Id: Ie4c1f10d20953aeb15438273081a810ab8bc9ec9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
James Turner [Fri, 6 Jul 2012 11:28:44 +0000 (12:28 +0100)]
QTBUG-26296, dock widget moving
Cocoa lacked implementation of FrameStrut events, and also frameMargins on
QPlatformWindow. Fix both of these issues. Unfortunately QDockWidget also
contains a tangle of #ifdef MAC behaviour which I am unclear about. What's
included here disables some logic on Mac that seems definitely wrong -
while moving a window on Mac we now generate NonClientArea events
(as intended, I believe), but this should not cause dock-widget dragging to end.
Note the window titlebar is the only frame-strut/non-client area on Mac (as far as I can see)
Task-number: QTBUG-26296
Change-Id: Id0c6e954db64b9f9f71d16355cb92922877e5ebe
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Stephen Kelly [Fri, 20 Jul 2012 07:57:52 +0000 (09:57 +0200)]
Add the CMake directory created during unit testing to .gitignore.
Change-Id: I769857ffca9ff14147d6704079fd0a55ff82fb79
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Stephen Kelly [Fri, 20 Jul 2012 12:56:40 +0000 (14:56 +0200)]
Exclude the delayed resource file test on Windows.
The feature does not work there.
Change-Id: I4c19577d3882b5ea01d20f4a67a512c1e6bc803e
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Stephen Kelly [Wed, 18 Jul 2012 15:35:52 +0000 (17:35 +0200)]
Add a test for all QtBase modules.
Change-Id: Ib87e56f063603d474e232a137246ab6a60f63a23
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Kai Koehne [Fri, 13 Jul 2012 11:31:45 +0000 (13:31 +0200)]
Logging: Simplify message handler logic for windows
Incorporate the functionality of qWinMessageHandler in qDefaultMessageHandler.
Change-Id: Iec5b19e187c0d2e3d8d0874280ba57f6fb21d7b4
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Sean Harmer [Wed, 18 Jul 2012 08:14:41 +0000 (09:14 +0100)]
Improve performance of QLibrary::load()
There is no need to create a QFileInfo object to split the path and
filename.
Change-Id: I54ebb4b62ebdd93a257bce0b337ac0012f0d5a56
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Elvis Lee [Sat, 21 Jul 2012 03:45:41 +0000 (12:45 +0900)]
release and clear next_bo when pageFlip fails
pageFlip failure makes starvation in waitForPageFlipComplete.
Change-Id: Ifbcdda2a4138753f475e4c37767058014cc4230b
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Friedemann Kleint [Tue, 17 Jul 2012 07:54:19 +0000 (09:54 +0200)]
QtPrintSupport: Replace remaining Q_WS_ conditionals by name checks.
Change-Id: Ic772e2187b3c93c5e0cdee6681289ab81e2c2f65
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Danny Boelens [Fri, 20 Jul 2012 13:26:07 +0000 (15:26 +0200)]
Fix Mac OS X architecture detection for non-default Xcode setup.
The arch.test script is now using SDK settings passed to it.
If you install Xcode without the "UNIX Development" option, this
is essential to let the compiler find standard headers and let
the test program compile successfully.
In addition, let configure pass the SDK settings given on the
command line to the arch.test script.
Change-Id: I49601d3068d83a71e21fdbac287857f2b7abedd1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Marc Mutz [Thu, 19 Jul 2012 20:45:42 +0000 (22:45 +0200)]
QFlags: complete constexpr'ifcation
Change-Id: Ie7c33bc1e3abaa9100093a84e65bee5f3b80fe0f
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Stephen Kelly [Fri, 20 Jul 2012 12:54:50 +0000 (14:54 +0200)]
Fix typo: delyed -> delayed
Change-Id: I1e9c17a85a52f15f252392426fa0b30c101c7c30
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Stephen Kelly [Fri, 20 Jul 2012 10:39:09 +0000 (12:39 +0200)]
Check if we are creating a static library before a framework.
Even if we are building frameworks, we still build some static
libraries (eg QtUiTools). Static libraries are never in frameworks
so we need to ensure that we don't generate a path to a framework
in the CMake config file in that case.
Change-Id: I533e30874a653695cb0e262617e71bbd3d4c954b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
David Faure [Sat, 23 Jun 2012 19:48:53 +0000 (21:48 +0200)]
Provide public API for native event filtering, moved up from QPA.
The previous API was hard to use (global function, no type safety,
manual chaining), and confusing (app vs dispatcher split only made
sense on Windows). Installing and removing out of order would have
the risk of setting back a dangling pointer (crash). Meanwhile QPA
added type safety, and this new API models the QObject::installEventFilter
API for ease of use. The virtual method is in a new interface,
QAbstractNativeEventFilter.
QPA was even calling the dispatcher event filter with QPA-private event
classes, which made no sense (refactoring leftover from when the code
was in the dispatcher). Now the QPA plugins trigger the qcoreapp event
filters with the actual native events directly.
Change-Id: Ie35e47c59c862383bcaf857b28d54f7c72547882
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Montel Laurent [Fri, 20 Jul 2012 16:25:02 +0000 (18:25 +0200)]
TYPO: Fix typo in warning message
Change-Id: I322f97257210f123695e386670a9a4eea2ccfe0e
Reviewed-by: David Faure <faure@kde.org>
Sergio Ahumada [Wed, 18 Jul 2012 09:34:23 +0000 (11:34 +0200)]
Doc: Fix QUrl::isLocalFile documentation
This function was introduced in 4.7 by
a2f797b52c4274a62a7cf1f0939aca1429afe211
but then reverted by
98e935eed5549e479f6666680aed1711dc42111c
Task-number: QTBUG-21293
Change-Id: I6ec9c6696e5c85e44774184010eb9135ef7f3365
Reviewed-by: David Faure <faure@kde.org>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Friedemann Kleint [Fri, 20 Jul 2012 14:11:05 +0000 (16:11 +0200)]
Tests: Replace deprecated QPixmap::grabWidget() by QWidget::grab().
Change-Id: I5018cf5dd51c1781e7f17c7d205f3f60de7945be
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Stephen Kelly [Fri, 20 Jul 2012 11:31:44 +0000 (13:31 +0200)]
Don't create cmake files for QtPlatformSupport.
It is for internal use only, not third party use.
Change-Id: I7a8dbc930e794ccdad4cc5591b454a640b921bb0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Friedemann Kleint [Mon, 16 Jul 2012 15:34:09 +0000 (17:34 +0200)]
Activate native window tests of QMdiArea.
Change-Id: Ic272b5e28256e454a3186d4407d009c9331b292b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Friedemann Kleint [Wed, 18 Jul 2012 11:12:59 +0000 (13:12 +0200)]
Implement waitForWindowExposed and friends for widget windows.
- Implement waitForWindowExposed() for toplevel windows.
- Implement waitForWindowShown(QWidget *) and mark as
deprecated in line with waitForWindowShown(QWindow*).
- Use in tests.
- Simplify tests (collapse waitForExposed, setActive
into setActiveWindow, waitForActive), remove most
hard-coded timeouts.
- Stabilize graphicsview tests by using waitForWindowActive.
Change-Id: Ic7c061e2745b36f71a715ee4e47c0346b11a91e8
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Andreas Holzammer [Fri, 20 Jul 2012 07:13:32 +0000 (09:13 +0200)]
Remove unneeded Windows CE dummy functions
With the change I69f4d5d504e2341555d9991c68e82beed2e8129c
IsZoomed function is no longer needed.
Change-Id: I07239f3e81509f8a966e64ee9705a04ea41cb38d
Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Elvis Lee [Thu, 19 Jul 2012 06:54:23 +0000 (15:54 +0900)]
Implement nativeResourceFunctionForContext for kms
Change-Id: I4e0486744f4c3eb711a9252c90b0d06c5bb3c670
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Laszlo Agocs [Wed, 18 Jul 2012 10:15:56 +0000 (13:15 +0300)]
Reset drm cursor position if cursor image is set before moved
Do not let the cursor appear at some random position and then jump
back to the top-left corner when first moved.
Change-Id: I0b77763bdfa86c23435d6cc07bdc13dfcc682567
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Laszlo Agocs [Wed, 18 Jul 2012 10:03:27 +0000 (13:03 +0300)]
Hide drm cursor when exiting
Change-Id: Ib4e1895dcf3e0168eb759fbecee499d75dd45bfe
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Martin Smith [Thu, 19 Jul 2012 13:25:44 +0000 (15:25 +0200)]
qdoc: Restricted qdoc errors for \reimp command
qdoc no longer considers the \reimp command when the
parent C++ class has been marked \internal, because
the reimplimented functions aren't supposed to be in
the documentation at all, when the parent class is
internal.
Change-Id: I3d811ca737934f95e9078ce7b1e957890f6aaf38
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Laszlo Agocs [Wed, 18 Jul 2012 10:35:14 +0000 (13:35 +0300)]
Disable threaded rendering with kms plugin
The page flip handling in QKmsScreen cannot currently cope with
contexts on multiple threads.
Change-Id: I9492095fec52fd1ad0197db00b3d6a2f58016e6d
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Jerome Pasion [Wed, 18 Jul 2012 16:07:31 +0000 (18:07 +0200)]
Doc: Removed Double Buffer example.
-The example no longer exists
Change-Id: I05485e950ca39918117cddee928f3c9da0fe1cb8
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Lars Knoll [Thu, 19 Jul 2012 11:53:50 +0000 (13:53 +0200)]
Fixed most qdoc errors for the json classes.
Change-Id: Ibbbdd7212f6c5e25422bbaa9ccaf4822db52222a
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
Andreas Holzammer [Thu, 19 Jul 2012 08:07:00 +0000 (10:07 +0200)]
Don't update geometry while the style is set
Under Windows CE a resize event gets fired
when the style is set, this will produce
geometry change events inside Qt, which will
end up in changing the geometry back and forth.
Change-Id: I7f834997abc53760ccfe2ad97012bb74dc5c705c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Stephen Kelly [Tue, 10 Jul 2012 08:35:45 +0000 (10:35 +0200)]
Move QWindowSystemInterface out of qpa.
Public QtTest headers require it, so all unit tests would have to use private Qt
headers otherwise, which is not practical.
Change-Id: I5d4466ec30b6a57ebdfc34413e716e657eb51368
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Martin Smith [Thu, 19 Jul 2012 10:55:37 +0000 (12:55 +0200)]
qdoc: Removed three qdoc files for qws example papges
qws is no longer relevant. These pages are now deleted:
deleted: mousecalibration.qdoc
deleted: simpledecoration.qdoc
deleted: svgalib.qdoc
Change-Id: I6ca77627cc6c018245cf16047b52c1145721e175
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Rafael Roquetto [Wed, 18 Jul 2012 13:37:21 +0000 (15:37 +0200)]
Enable CUPS auto detection on Windows
Detect CUPS availability automatically when cross-compiling from a Windows
host.
Change-Id: Ife9bb90732c39794a7b760ced4aaea232612fe54
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Joerg Bornemann [Mon, 9 Jul 2012 10:33:36 +0000 (12:33 +0200)]
QWidget/Win: fix restoreGeometry() from fullscreen mode
When turning off fullscreen mode and restoring the widget's geometry
we must inform the QWindow about the geometry change synchronously.
Otherwise QWidget::geometry() will return the old value.
Using the same technique for the state transition to fullscreen mode
without sending a separate resize event.
Autotest: tst_QWidget::saveRestoreGeometry
Task-number: QTBUG-26421
Change-Id: I869e36cd302d9a94e398f48949ab3cb7ee9cdf51
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Stephen Kelly [Wed, 18 Jul 2012 17:05:55 +0000 (19:05 +0200)]
Remove Q_UNUSED for the metaObject.
The object is no longer unused.
Change-Id: Ia82539220855321f2986c5791b70be5df399baca
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Friedemann Kleint [Wed, 18 Jul 2012 13:58:28 +0000 (15:58 +0200)]
Remove the test tst_qdialog::throwInExec().
QtWidgets and QtGui are currently compiled without exceptions,
which causes a crash with gcc 4.6.3.
Change-Id: I8f872f3bec6266444adf08d51a6678150c5fae8e
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Casper van Donderen [Thu, 19 Jul 2012 10:39:41 +0000 (12:39 +0200)]
QDoc: Fix make commands for QDoc manual.
Change-Id: I55c3eae43928e87a0aa470127f9877741391deee
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Jeremy Katz [Wed, 18 Jul 2012 23:27:23 +0000 (01:27 +0200)]
fix "No such ..." doc error for QString::toHtmlEscaped
And a minor rephrase. [...] a HTML -> an HTML
Change-Id: I49804d009737b58ca3bb43e60dac869e045b5536
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Jeremy Katz [Wed, 18 Jul 2012 23:16:38 +0000 (01:16 +0200)]
fix "No such ..." in qmargins
Is it more appropriate to rename the parameter in question
"margin", as suggested by the documentation, or have the
documentation refer to "m", as suggested by the code?
Change-Id: I5768ef044164e099ef1db77adda42171799cbf12
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Jeremy Katz [Wed, 18 Jul 2012 22:51:36 +0000 (00:51 +0200)]
fix "No such ..." doc error for Qt::WindowType WindowOverridesSystemGestures
Is this a typo in the documentation, or in the enum?
Change-Id: I58ba12d74694b26ec0bf76226b56337a12e0756e
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Jeremy Katz [Wed, 18 Jul 2012 22:43:10 +0000 (00:43 +0200)]
fix "No such ..." error in qnamespace.qdoc
RIP Qt::ClipOperation UniteClip
See
01b72952c38b9193138eabdab6bdab632cd75ebd for details
Change-Id: I8cfd5f6d008374741bea4f6a85827545ddb8ae86
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Jeremy Katz [Wed, 18 Jul 2012 22:22:17 +0000 (00:22 +0200)]
fix "No such ..." doc error for QMetaType::typeName()
Change-Id: If00c728ec793a65f62d76d8301c7f6658e7af8a0
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Jeremy Katz [Wed, 18 Jul 2012 22:13:07 +0000 (00:13 +0200)]
fix "No such ..." in doc for QMetaEnum::keysToValue()
Change-Id: I4cc15031970a34ee1076933f7f13468ee17abcfd
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Jeremy Katz [Wed, 18 Jul 2012 22:08:11 +0000 (00:08 +0200)]
fix "No such ..." doc error in QBasicTimer::start()
Change-Id: I52feb5f2ebcc8821470468fc51ed3acc6df92a67
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Stephen Kelly [Thu, 19 Jul 2012 08:40:25 +0000 (10:40 +0200)]
Add another directory to the private INCLUDE_DIRS list.
It should be possible to include both:
* <QtGui/private/qfoo.h>
* <private/qfoo.h>
Change-Id: I83ed5bba633b4a6b9bd38e315c987d78beecfb1b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Stephen Kelly [Thu, 19 Jul 2012 09:51:34 +0000 (11:51 +0200)]
Dereference so we can be sure the type is not forward declared.
Change-Id: I4d67a08dc645649e767153f3aa0dc57b15d50a84
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Andreas Holzammer [Thu, 19 Jul 2012 09:05:18 +0000 (11:05 +0200)]
Fix window state handling
There is no need to query each time the window state
from windows, as we already know in which state it is.
We are also getting state change notifications. This fixes
issues under Windows CE.
Change-Id: I69f4d5d504e2341555d9991c68e82beed2e8129c
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Jeremy Katz [Thu, 19 Jul 2012 00:44:43 +0000 (02:44 +0200)]
fix "No such ..." for QMimaeDatabase::mimeTypeForFile()
Change-Id: Ife8e361524ac324ce2cfb20d952db5be042fecc1
Reviewed-by: David Faure <faure@kde.org>
Jeremy Katz [Thu, 19 Jul 2012 01:39:00 +0000 (03:39 +0200)]
fix "No such ..." for QObject::connect(...,functor) doc
Change-Id: Idd1d871b0fde899fdd21ce5aa365e08e2c7bcf45
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Jeremy Katz [Wed, 18 Jul 2012 21:44:54 +0000 (23:44 +0200)]
fix "No such ..." documentation errors in QAbstractItemModel
Change-Id: Ic1d0761c310c47f95d98988d77aff0f8e46de5fb
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Rafael Roquetto [Wed, 18 Jul 2012 13:25:13 +0000 (15:25 +0200)]
Improve Windows XP and Vista styles auto detection
Do not build windows styles when the target platform is not Windows. This
makes a difference when cross-compiling.
Change-Id: I2184d39ed253af1069c5cdcd6a848611cff24789
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Oswald Buddenhagen [Thu, 12 Jul 2012 18:33:25 +0000 (20:33 +0200)]
use QT_INSTALL_LIBS directly instead of messing with QMAKE_LIBDIR
this is what this code assumes anyway
Change-Id: I667412b101c18325321a568cc22d25ef07418ffb
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Oswald Buddenhagen [Thu, 12 Jul 2012 14:49:02 +0000 (16:49 +0200)]
remove QTDLL_POSTFIX stuff
the libinfix provides a way cleaner solution to that. i don't expect it
to be still actually used anyway.
Change-Id: I051522ec3abb3d92c529b5462b8514a706aa2ba1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Oswald Buddenhagen [Fri, 13 Jul 2012 11:20:13 +0000 (13:20 +0200)]
remove needless/commented INCLUDEPATHs
Change-Id: Id1d3afde424e0e17e68889d6f7b51e3056754536
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Marc Mutz [Mon, 16 Jul 2012 14:49:51 +0000 (16:49 +0200)]
qmetaobject_p.h: don't (incorrectly) fwd-declare QVarLengthArray
qmetaobject_p.h forward-declared QVarLengthArray without the default parameter
for the 'int' template argument. This violates the ODR, so just #include the
header instead. It's not like there's much point in the fwd declaration in
a private header.
Change-Id: Ie5ef1740c57da396c95f5bae1cd81ac941a8ac2d
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Sergio Ahumada [Wed, 18 Jul 2012 08:29:07 +0000 (10:29 +0200)]
Fix typo in configure for Mac: Libraries -> Library
Task-number: QTBUG-18115
Change-Id: I81f82d417dfff94c0ebcd41f0f9f3cd3223bac2c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Oswald Buddenhagen [Tue, 10 Jul 2012 19:35:39 +0000 (21:35 +0200)]
put the include/ of all modules into qtbase when doing non-prefix build
all other build artifacts go into qtbase's build directory anyway. this
asymmetry was confusing and causes cmake users some grief.
Change-Id: I4d7f7b2318f6c5300eb00360664785cb2c8217b7
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Oswald Buddenhagen [Tue, 17 Jul 2012 14:09:41 +0000 (16:09 +0200)]
generate the module version header directly in the include directory
... instead of having a forward from the include dir to the (shadowed)
source dir of the module.
Change-Id: I967227950e8aeb1b9f62befbf9fff3746a0486b6
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Stephen Kelly [Fri, 13 Jul 2012 18:40:09 +0000 (20:40 +0200)]
Make the QIncompatibleFlag constexpr.
Change-Id: If99b43b45cc667449dbe7c487b56885c6ce9b1c7
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Friedemann Kleint [Wed, 18 Jul 2012 08:10:01 +0000 (10:10 +0200)]
Track window state in manual test windowflags.
Change-Id: Ief6cd4b29ddcc946e1ccac75b352da80bbf647d0
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Miikka Heikkinen [Tue, 17 Jul 2012 13:35:38 +0000 (16:35 +0300)]
Fix rendering glitches when using native widgets in MDI subwindows
When mixing native and regular widgets in same QMdiArea, some
subwindows didn't properly get set native. This was because
when a native parentless widget was given a parent, it wouldn't
enforce native window on the new parent and its ancestors.
This happened because window flags were adjusted too late in
relation to createWinId() call in setParent_sys().
Fixed by moving the createWinId() call to its proper place.
Also removed some old Q_WS_* ifdeffing in QWidget::setParent() that
masked some native enforcement code.
Additionally removed few QEXPECT_FAILs from QWidget autotest now
that those cases work correctly.
Task-number: QTBUG-26424
Change-Id: Ib6f9d0531e5c7299e2c307734d49c81f1ffa9713
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Sergio Ahumada [Wed, 18 Jul 2012 08:37:56 +0000 (10:37 +0200)]
Widgets: Fix duplicated line in QMdiArea
Replace duplicated line MaximizeAction with RestoreAction
Task-number: QTBUG-17428
Change-Id: I5120afeed6715d28045f3eee01f26ee482f02ed1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Marc Mutz [Thu, 12 Jul 2012 20:26:31 +0000 (22:26 +0200)]
QtNetwork: normalize signals/slots
This is the result of running util/normalize --modify
from Qt 4.7 with manual review.
Change-Id: I3f89d5138ea9905c42ed581991426e72c90d4069
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Rafael Roquetto [Wed, 18 Jul 2012 12:06:42 +0000 (14:06 +0200)]
Auto detect iconv on Windows hosts
Enable auto detection for iconv when
cross-compiling from Windows hosts.
Change-Id: I699e0a31d938403f5e80e74be90df87f11f361ba
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Rafael Roquetto [Wed, 18 Jul 2012 12:01:08 +0000 (14:01 +0200)]
Fix auto detection in configure.exe
All auto detection tests were failing
because the default mkspec was not yet
installed during the time they were run.
Change-Id: Iad14580f38d1539d9831917e5c9c707eae4c0c90
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Friedemann Kleint [Thu, 12 Jul 2012 07:54:50 +0000 (09:54 +0200)]
Mirror potentially themeable style hints in QPlatformTheme.
Currently, most of the QStyleHint-values are potentially
configureable by the user in certain desktop environments.
Add them to the QPlatformTheme and query the theme first.
Keep the values in QPlatformIntegration such that simple
integrations that do not implement themes are not forced
to implement them to change the values.
Change-Id: I15742a5968df0ad5d7398cceae640dc7e541da52
Reviewed-by: David Faure <faure@kde.org>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Laszlo Agocs [Tue, 17 Jul 2012 09:45:20 +0000 (12:45 +0300)]
Follow gbm api changes in kms plugin
Change-Id: I3058f4d3540b04710a853bbaa901bdbecf35b4b5
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Laszlo Agocs [Tue, 17 Jul 2012 07:44:18 +0000 (10:44 +0300)]
Tear down properly in kms plugin when exiting
Change-Id: Idad060af4a8b4e68c2312cc2b69de39d2a58a1c4
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Laszlo Agocs [Mon, 16 Jul 2012 13:13:18 +0000 (16:13 +0300)]
Add config test for kms
Change-Id: I55afc65d356aaca0fe443dda100805a4df8f0ae6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Casper van Donderen [Mon, 16 Jul 2012 12:25:52 +0000 (14:25 +0200)]
Fix incorrect #endif comment.
Change-Id: I7cf93b928c7ee9915fe95e13f3faa036ac05f608
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Tasuku Suzuki [Tue, 10 Jul 2012 15:31:47 +0000 (00:31 +0900)]
removing QT_NO_URLINFO and using QT_NO_FTP instead
URLINFO was removed from qfeature.txt but QT_NO_URLINFO macro was not
removed. As QUrlInfo is now private and only used for FTP, the class can
be disabled when FTP is disabled.
Change-Id: Ic63b066f8ff9ad1eea0073ab75b622e5739ac5a8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Friedemann Kleint [Mon, 16 Jul 2012 14:14:17 +0000 (16:14 +0200)]
Fix widget animations.
- Update opacity.
- Change Q_WS_WIN to Q_OS_WIN.
Task-number: QTBUG-25436
Change-Id: I76c1e4668dc2ee4f4d861da320c10aa05e57e804
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Rafael Roquetto [Tue, 17 Jul 2012 09:52:10 +0000 (11:52 +0200)]
Set correct QT_LFLAGS_SQLITE for default cases.
In systems where no pkgconfig is available, such as QNX, we set
QT_LFLAGS_SQLITE to the default values.
Change-Id: I24edd589ce7baf2614480a91842ca756ead39463
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Friedemann Kleint [Mon, 16 Jul 2012 13:35:58 +0000 (15:35 +0200)]
Windows: Do not return short path names for QDir::tempPath().
WinAPI GetTempPath() sometimes returns short names
for C:/Users/<user>/AppData/Local/Temp.
Change-Id: I33f991acc06e652ccd484d36a5a384eb776f8395
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Friedemann Kleint [Tue, 17 Jul 2012 07:52:31 +0000 (09:52 +0200)]
Unix printing: Fix suggested file name for printing to file.
Change-Id: Ieefe602dc8328a2e4188f7fa341016f8e330526e
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Jeremy Katz [Mon, 16 Jul 2012 20:38:18 +0000 (22:38 +0200)]
Typo in QWaitCondition::wait() doc: lcokedReadWriteLock
lcokedReadWriteLock -> lockedReadWriteLock
Change-Id: I560f7445d6a0c332ee8ca8f62a8318f637567520
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Jeremy Katz [Mon, 16 Jul 2012 20:19:55 +0000 (22:19 +0200)]
Correct documentation for Void metatype value, define UnknownType
QMetaType::Type::Void was misdocumented as being equal to 0. The
actual value for Void is currently 43. UnknownType is 0.
Change-Id: I4e9cb3b4d21e10e1691b985a6ad635bc7a04f1b7
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Jeremy Katz [Mon, 16 Jul 2012 20:14:23 +0000 (22:14 +0200)]
Add new metatypes to QMetaType::Type enum for docs
This adds QRegularExpression, QJson{Value,Object,Array,Document}, and
SChar
Change-Id: I3dbe9d197952e980f0de9eaed2605d190b8d0405
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Jeremy Katz [Mon, 16 Jul 2012 19:05:47 +0000 (21:05 +0200)]
Remove Qt3Support enums for q{dir,filedevice,settings,variant} in docs
Change-Id: I07942447bb756561e5c502c9a0c03b6aaf8133d1
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Jeremy Katz [Mon, 16 Jul 2012 16:39:47 +0000 (18:39 +0200)]
Remove documentation of previously deleted Accessibility events
Change-Id: I7996f2f9b6d11cea130e2a56d0997e1f208e5642
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Jeremy Katz [Mon, 16 Jul 2012 16:36:00 +0000 (18:36 +0200)]
Remove documentation of Qt3Support enums in qcoreevent.cpp
Change-Id: Id8740adaa26ee44f40010373947a5be82942b0ba
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Rafael Roquetto [Mon, 16 Jul 2012 16:23:33 +0000 (18:23 +0200)]
Install right version of tools when x-compiling.
When cross-compiling from a Windows host, we need to install the right (win32)
versions of syncqt and qmake into the target folder.
Change-Id: I35fc4b05bb6ad7605bc932cae527372a9fe0ba3e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Sergio Martins [Fri, 23 Mar 2012 23:07:43 +0000 (23:07 +0000)]
Normalize signal/slots.
Change-Id: I0a0f497ece081a430437adc2959deb247defcde9
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Stéphane Cerveau [Tue, 17 Jul 2012 06:11:28 +0000 (08:11 +0200)]
Fix infinite loop due to FPU limitation
Bug detected with animatedtiles in example/animation.
In qpa mode, using some specific resolution of directfb such as
800x600 causes a bug in FillRectF where there is an infinite loop due
to scalabilty of qreal value: One is rounded and the other not.
Change-Id: I1707e53f34aeeadc0f0fc07b1dca148fbe05b5f1
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Mark Brand [Wed, 11 Jul 2012 14:29:53 +0000 (16:29 +0200)]
QSqlTM: add reimplemented record() method
QSqlQueryModel::record(row) populates the record it returns with values
from virtual data(), so the values themselves can be supplied by
QSqlTableModel. However, it is also desirable to be able to interrogate
QSqlTableModel for the actual current record in its cache, including
properties such as the generated flag.
Change-Id: I733901913b7d237d5762448e953a99b5bd83fc7f
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Mark Brand [Wed, 11 Jul 2012 07:52:14 +0000 (09:52 +0200)]
QSqlTM: use generated flag more correctly in setRecord()/insertRecord()
The generated flag should affect the generation of SQL commands rather
than how the fields of the source record are applied to the model before
submitting. This correction allows setRecord() to be used to change TRUE
generated flags to FALSE.
Clarified documentation on this point and updated change log.
Change-Id: I7ee124930822561ed8beee6c6259970b3e929c9b
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Charles Yin [Mon, 16 Jul 2012 01:32:22 +0000 (11:32 +1000)]
Don't join between 2 same points
Joining 2 points with same x,y values causes assert in QTriangulatingStroker::normalVector().
Task-number: QTBUG-26528
Change-Id: I2494d7f362e13e41a82753f4bacf97ffbc249cf9
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>