Jason McDonald [Thu, 12 Jan 2012 04:57:08 +0000 (14:57 +1000)]
Improve coverage of expectfail selftest
Add a test case for calling QEXPECT_FAIL in a data-driven test without
passing a specific data tag for the expected failure, in which the
expected failure should apply to the current data row.
Change-Id: I70a6592de77b1718c3a749fd2216e66f8f312805
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Thu, 12 Jan 2012 03:47:25 +0000 (13:47 +1000)]
Improve coverage of expectfail selftest
Add a test for the case where a call to QEXPECT_FAIL nominates a
different data row from the current row, in which case the call to
QEXPECT_FAIL should be ignored.
Change-Id: Iff774b89f9374fa26105acdd8769177272a95229
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Martin Smith [Thu, 12 Jan 2012 07:42:08 +0000 (08:42 +0100)]
qdoc3: Don't put a \table in a \value
In qdoc, the \value command is meant to document a single value of an
enum. e.g.
\value TypeOfService Text describing the type of service. It runs until
the next \value or a blank line.
Although it doesn't say you can't build a \table in the \value text,
it doesn't work. For now, the fix is to remove the \table from the
\value text and make the table separate from the enum \value list and
let the description of the \table refer to the value that it belongs
to.
Task-number: QTBUG-23599
Change-Id: I88b456dca419a565eece30ba20fe09c0bcd4d98d
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Martin Smith [Thu, 12 Jan 2012 08:04:53 +0000 (09:04 +0100)]
qdoc3: Don't put \relates in class member functions.
This removes two uses of \relates that were unnecessary.
Task-number: QTBUG-23600
Change-Id: Id9bbcfa6f95d42ad552054e4839dbacb69fd1b2a
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Kalle Lehtonen [Fri, 13 Jan 2012 01:44:25 +0000 (02:44 +0100)]
Revert "Fixed qtmodule-configtests on Windows"
This reverts commit
bb4caf3c4937418ca0e33d60cf0b25d6cfc3ea95
Change-Id: I25a9e45c9fa0953bdfe1bc112bf45341802c020d
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
Jason McDonald [Thu, 12 Jan 2012 03:16:44 +0000 (13:16 +1000)]
Improve coverage of expectfail selftest.
Add a test for the case where QEXPECT_FAIL is called twice in a row
without an intervening verification step, which is supposed to result in
a failure.
Change-Id: Ie004652a76a2c35c2679945670ff5561e8f5b62e
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Alexander Færøy [Thu, 12 Jan 2012 19:02:39 +0000 (20:02 +0100)]
Remove shadowing members in QNetworkReplyHttpImplPrivate
Task-number: QTBUG-23512
Change-Id: I072dfde1741a1d32a6125f63e52cc22bc499987f
Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
David Faure [Thu, 12 Jan 2012 17:00:42 +0000 (18:00 +0100)]
Fix compilation of public headers with -Werror=shadow
Change-Id: Id47623002abca1e03fdfb9e9bd9cbc1b5542a2db
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Friedemann Kleint [Thu, 12 Jan 2012 15:03:33 +0000 (16:03 +0100)]
Fixed qtmodule-configtests on Windows
open to "|-" and "-|" are unsupported on Windows (see `perldoc
perlport'), so don't do that.
Rather than parsing the output of make to decide if a config test is
skipped, use a looser definition: it is skipped if qmake and make both
succeed, but no binary is created.
Change-Id: Idab7266888e9c934aa7b5c1c6ac5930439681107
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
David Faure [Thu, 12 Jan 2012 11:49:20 +0000 (12:49 +0100)]
Fix compilation of Qt itself with QT_NO_DEBUG_STREAM
Change-Id: I07087dff0f109347ea80434f17eeb7cc1c13114c
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Jan-Arve Saether [Tue, 10 Jan 2012 13:44:52 +0000 (14:44 +0100)]
Remove invokeMethod in favor of the recommended virtual_hook()
We don't remove the Method enum (yet), since there are functions in
dependent modules that still refer to it.
Unfortunately there is no way we can commit to several repos
"atomically".
Change-Id: Ia1923dc4bf0751a9ba67727d14da5a2e60bd4e74
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Jan-Arve Saether [Fri, 6 Jan 2012 14:51:53 +0000 (15:51 +0100)]
Remove all references to QAccessible::(Up|Down|Left|Right)
It is now the resonsibility of the bridge to support this
(by querying for QAccessibleInterface::rect())
The windows bridge (currently the only bridge in need of this) has
already been updated to reflect this in commit
7dca461620ee6d8cce3a74acf2e1530d4497bff9
Change-Id: Ief1339ab6edc118e2d47e3875e09fa885db65c2f
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Frederik Gladhorn [Mon, 9 Jan 2012 13:18:18 +0000 (14:18 +0100)]
Remove QAccessibleEvent
It was unused and I don't quite understand its purpose any more.
Change-Id: I5c946a1644fd64508cb4aad78320ae96fd935d31
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Lars Knoll [Thu, 12 Jan 2012 13:24:39 +0000 (14:24 +0100)]
Compile if the header files from QtWidgets are unavailable
Change-Id: I0a774fc1492e882bc6c02d913e6dace189fdb992
Reviewed-by: Kevin Simons <kevin.simons@nokia.com>
Jonas M. Gastal [Wed, 11 Jan 2012 12:48:08 +0000 (10:48 -0200)]
Make QFtp private.
All references to QFtp in documentation have been removed, QFtp's
documentaiton was marked internal. The QFtp example was removed.
Task-number: QTBUG-23199
Change-Id: Ifff83cac069fb350e8ebeae63e605850e65c0c30
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Bradley T. Hughes [Wed, 11 Jan 2012 10:31:51 +0000 (11:31 +0100)]
Add Q_COMPILER_* defines for C++11 features supported by clang
Change-Id: I9487720c33e6ac628f7e13f80057524a950c4c5d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Bradley T. Hughes [Wed, 11 Jan 2012 13:23:05 +0000 (14:23 +0100)]
Don't crash during QApplication construction
The QCoreApplication::init() function calls the virtual
QCoreApplicationPrivate::createEventDispatcher(), which for
QApplication, also creates the plaform integration. Unfortunately, the
Cocoa menubar integration uses qApp before QApplication is constructed,
causing a crash. Circumvent this by using QGuiApplicationPrivate
directly.
Change-Id: Ib36f628641761e70f9e9e39dd23e70e7537a165b
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Bradley T. Hughes [Thu, 12 Jan 2012 10:40:51 +0000 (11:40 +0100)]
Make QFileSystemWatcherEngines children of QFileSystemWatcher
To support moving QFileSystemWatcher to another thread, the engines need
to follow when the watcher is moved. The easiest way to do this is by
parenting the engines to the watcher.
Change-Id: Ie2bb701c0c148da9cc2302d4de23286b8ef42c4d
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Bradley T. Hughes [Thu, 12 Jan 2012 10:43:23 +0000 (11:43 +0100)]
Do not call moveToThread(this) in QWindowsFileSystemWatcherEngineThread
This is considered bad practice, and gives no benefit as the threads do
not use an eventloop.
Change-Id: I0de9eca97948571cf5091e2f1b19bb1faab3e2ac
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Lars Knoll [Thu, 12 Jan 2012 13:23:57 +0000 (14:23 +0100)]
Add setPalette to QGuiApplication
If we have a getter, we also need the setter to be
symmetric.
Change-Id: Ibcb20d66c711e4c1bebd448781fa9eddb9cd773f
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Lars Knoll [Thu, 12 Jan 2012 13:23:37 +0000 (14:23 +0100)]
Don't include qdialog.h
Change-Id: I67d48653b90f31d018c77ec069eb559ac46f9275
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Samuel Rødal [Wed, 11 Jan 2012 12:16:24 +0000 (13:16 +0100)]
Made it possible to report screen changes through QWindowSystemInterface.
This makes it possible for platform plugin independent code (such as
generic plugins) to report changes to screen properties. An example
would be an accelerometer plugin that reports orientation changes
without knowing anything about the windowing system.
Change-Id: I984984b6d064327772c264bc942269422451da37
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Friedemann Kleint [Wed, 11 Jan 2012 15:58:45 +0000 (16:58 +0100)]
QFileSystemWatcher/Windows: Output paths if FindNext fails.
Change-Id: I72bd28868c84d37e3dd4ea8ab892fa092d853d4a
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Morten Johan Sorvig [Mon, 9 Jan 2012 13:37:33 +0000 (14:37 +0100)]
Ignore uninteresting accessibile interfaces.
Certain interface roles should be ignored and not
be a part of the user-visible accessibility interface
tree.
Change-Id: I264fef909052c528ee505875e3a211a33114d881
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Laszlo Agocs [Wed, 11 Jan 2012 18:02:25 +0000 (20:02 +0200)]
Do not mark any touch points as primary when no mouse event is sent
The touchscreen plug-in generates touch events only and therefore no
touch point must be marked as primary because that would mean there
is also a mouse event created from that point which is not the case.
Change-Id: I80c5fdbc52b048cd74c834900b6c8100963210e6
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Samuel Rødal [Wed, 11 Jan 2012 07:31:00 +0000 (08:31 +0100)]
Make show() default to sane sizing behaviour based on the platform.
Traditionally it's been hard to write a Qt app that behaves sanely
across embedded and desktop platforms, i.e. defaults to fullscreen on
embedded and non-fullscreen on desktop. For Qt 5 we can fix this by
making the behaviour of the default QWindow::show() be customizable by
the platform plugin.
If the application developer wants to override this behaviour he can
still use the explicit showFullScreen(), showNormal() etc functions.
Change-Id: I26a907b404058e345d841c818daefbb57a26d3fd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Friedemann Kleint [Wed, 11 Jan 2012 15:20:29 +0000 (16:20 +0100)]
Stabilize Language-Change test.
- Introduce separate state machine class with a timer instead of
using semi-synchronous qWait(). Also invoke closeAllWindows()
repeatedly should the file dialog be slow on Windows.
- Use QTemporaryDir for test data to avoid conflicts with
remains from previous tests.
Change-Id: Ibd95176b44ff20d6f326dc3139fb386472f64c2b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Kai Koehne [Wed, 11 Jan 2012 10:26:38 +0000 (11:26 +0100)]
Fix CONFIG+=declarative_debug if declarative is implicitly added
Change
1fb5600c5eb2ee2af8a766dea5b325aee6dd43b4 already added
declarative-debug as a way to include declarative, but nowadays
there's also qquick, and qquick-private ...
Just always set the define. The user has choosen to write
CONFIG+=declarative_debug in the first place and an additional
define if declarative isn't used does no harm.
Change-Id: Ica6142e70b12950fc1d9e0bf7b94f747c843a17f
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
David Faure [Tue, 29 Nov 2011 19:55:26 +0000 (20:55 +0100)]
QTreeView: fix crash when starting a drag with hidden columns.
Crash was introduced by
d639105759491 (pre-Qt-4.8 only)
Task-number: QTBUG-15834
Merge-request: MR-2725
(cherry picked from qt4 commit
fd25323de7b5d5f3e0ffb1bd81ea4d251e071566)
Change-Id: I59959d3ba4c9bcb0d39bdbe58432817bbbfdd9f1
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
David Faure [Fri, 3 Dec 2010 10:34:09 +0000 (11:34 +0100)]
Set missing flags in the option when rendering QTreeView drag pixmap
QAbstractItemViewPrivate::renderToPixmap was not setting all the flags
that the normal QTreeView painting sets:
option.showDecorationSelected, option.viewItemPosition (so the drag pixmap
looked wrong on Windows 7, with rects around each cell), and then the
unittest also discovered that State_Children/State_Sibling wasn't set either.
Task-number: QTBUG-15834
Merge-request: 2517
(cherry picked from Qt4 commit
d63910575949106f84dacf04abaa14fc866aa66b)
Change-Id: I0a5014d960543c3ed8fea73d6df578e7e521b0e0
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Jason McDonald [Wed, 11 Jan 2012 07:01:16 +0000 (17:01 +1000)]
Make expectfail selftest test XPASS.
Change-Id: I0f7943049995c7fa4ad70a05fd2fdac4bc9f6ff6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Wed, 11 Jan 2012 06:26:03 +0000 (16:26 +1000)]
Make selftest for QEXPECT_FAIL more robust.
Make the test fail if calling QEXPECT_FAIL with the mode set to Abort
does not cause the current test function to abort. Previously, such an
error would not cause the selftest to fail and someone would have to see
the warning message in the test output to know that there is a problem.
Change-Id: I2bd58fafe6b51ea0ab86fde7c5afb781e4534ee4
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Wed, 11 Jan 2012 06:18:55 +0000 (16:18 +1000)]
Improve selftest coverage of QEXPECT_FAIL feature.
The existing expectfail selftest did not test QEXPECT_FAIL with a
data-driven test function. This commit adds such a test.
Change-Id: I39fa9aa227b58779ce5268dd37bf55468e7269c5
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Rohan McGovern [Wed, 11 Jan 2012 05:40:24 +0000 (15:40 +1000)]
Fixed findtestdata selftest on mac
This test relies on being able to set a custom QLibraryInfo::PrefixPath
for the duration of the test. However, the test code neglected to
account for the following behavior on mac (from "Using qt.conf"
documentation):
On Mac OS X, the Prefix is relative to the Contents in the application
bundle.
Change-Id: Ie9b6d5ebfe8af7d7f332e827069b60a830d6c6f2
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Michael Brasser [Wed, 14 Dec 2011 05:01:34 +0000 (15:01 +1000)]
Abstract QUnifiedTimer.
QUnifiedTimer now controls QAbstractAnimationTimers, which
in turn can be used to drive specific animation systems.
The purpose of this change is to allow the QML animation
system to be rewritten so that it does not depend on
QAbstractAnimation.
Change-Id: If06475002e41ba85b1b86b5dd4788de6d27d035d
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Toby Tomkins [Thu, 12 Jan 2012 04:59:14 +0000 (14:59 +1000)]
Flag test as expected failure for Ubuntu 11.10 x64.
Change-Id: I05ff434581f48d4d3ede7ecb59208821a2ab3e7d
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Toby Tomkins [Thu, 12 Jan 2012 01:38:55 +0000 (11:38 +1000)]
SSL Socket withoutproxy failures on Ubuntu 11.10 x64.
Numerous failures in the qsslsocket autotest suite relating to
connections without using proxies. Some have been skipped due to
the number of failures, other more specific tests have been set
to expect a failure.
Task-number: QTBUG-23575
Change-Id: I35fccc65bcab303646617a57a33f5aa7f7a4323f
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Toby Tomkins [Thu, 12 Jan 2012 03:09:28 +0000 (13:09 +1000)]
Flag tst_qgraphicsview as insignificant, test are unstable.
Some of these test have had unstable results for multiple runs.
QTBUG_4151_clipAndIgnore and QTBUG_16063_microFocusRect seem to be the
unstable tests.
Task-number: QTBUG-16063
Task-number: QTBUG-4151
Change-Id: Idd108197c327446080dbd69dfe5c5fba6b2944cd
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Stephen Kelly [Tue, 10 Jan 2012 05:08:09 +0000 (06:08 +0100)]
Test that the CMAKE_AUTOMOC feature works with Qt5.
Update the wrapper macro which had bitrotted a bit.
Change-Id: I65c7940f9ebc0e1c963fddd2bbfc06b89e66df04
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Bradley T. Hughes [Wed, 11 Jan 2012 11:47:07 +0000 (12:47 +0100)]
Ensure proper locking in QFileInfoGatherer
The mutex is used to protect the QFileSystemWatcher instance created by
QFileInfoGatherer, except when calling getFileInfos(). Add a locker
before using QFileSystemWatcher in this function.
Note: it appears that QFileInfoGatherer is misusing QFileSystemWatcher
by calling it from multiple threads. QFileSystemWatcher is an event
driven class, and as such, not thread-safe. So far, no problems have
been reported related to this, so I've left the code as-is.
Change-Id: Ib1429d9399e37120acf8e8d3b989b83c4ce24203
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Bradley T. Hughes [Wed, 11 Jan 2012 08:00:41 +0000 (09:00 +0100)]
Remove unnecessary QMutexes in QFileSystemWatcher implementations
The polling, inotify, and kqueue implementations are no longer threaded,
and as such, do not need mutexes to protect their internal data (since
QFileSystemWatcher itself is not documented as a thread-safe API).
The Windows implementation is unchanged as it uses multiple threads
explicitly.
Change-Id: Ia82510397e576bf704ce3aed3d776b58b39f7ff3
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Bradley T. Hughes [Wed, 11 Jan 2012 11:42:50 +0000 (12:42 +0100)]
Avoid races when destroying QFileSystemWatcher
On Mac OS X, socket notifiers need to be disabled/destroyed before
closing their associated file descriptor, otherwise we cause races
inside the CFSocket system. The documentation for CFSocketInvalidate()
says that we close the file descriptor after calling this function when
the kCFSocketCloseOnInvalidate flag is explicitly cleared
(QCocoaEventDispatcher clears this flag).
Do the same on the Linux inotify watcher as well, for symmetry.
Change-Id: I5592cc4bb5be4b752e48d895a685d3c92826acc7
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Mark Brand [Tue, 10 Jan 2012 23:26:22 +0000 (00:26 +0100)]
Windows: Adapt cross mkspec for MinGW / gcc 4.6.
4.6 becomes the minimum required version in Qt 5.
This commit follows
f6c61d13a3e166fc9280e8bfe8325cead335d0da.
Change-Id: I151cd5ae63f076c4aa766bc5c9b9fb4d8fcd4f79
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Kim Motoyoshi Kalland [Wed, 11 Jan 2012 09:38:48 +0000 (10:38 +0100)]
Fixed QOpenGLShader::log().
log() returned an empty string because the compile log was stored
in a local variable rather than the member variable.
Change-Id: I60142fd0bccfcbb495cea430b583f81fb0241329
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Janne Anttila [Wed, 11 Jan 2012 13:55:08 +0000 (15:55 +0200)]
Docs: Forward-ported typo and link fixes from Qt 4.8
This commit brings already accepted doc fixes to Qt5.
Task-number: QTBUG-9224
Task-number: QTBUG-13442
Task-number: QTBUG-19858
Task-number: QTBUG-21447
Change-Id: I2ebc7c3e74427545367bdcec51e9e710a4925747
Merge-request: 1402
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Friedemann Kleint [Wed, 11 Jan 2012 10:49:35 +0000 (11:49 +0100)]
QStyleHelper: Base DPI-calculation on QScreen.
- Use qt_defaultDpiX() to obtain the resolution, which
obtains it from QScreen. This implies that for X11,
which previously used a hardcoded default of 96 DPI,
the real resolution will be used (typically 75).
- Since many tests (layouts, graphicsview) contain
test data for 96 DPI, add an attribute to
QCoreApplication making it possible to set the
resolution to 96 DPI for testing.
Change-Id: I77c8233a96b0d75de07406f58d48886a89c3de06
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
David Faure [Wed, 11 Jan 2012 10:15:03 +0000 (11:15 +0100)]
Remove unused QT_NO_TEXTSTREAM.
It was checked in a few places, but it didn't actually remove QTextStream,
so it was pretty useless.
Change-Id: I8eaf28893cd6c7acbe1c0b69d58de90742aee755
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Friedemann Kleint [Wed, 11 Jan 2012 10:30:47 +0000 (11:30 +0100)]
qlocalsocket_win.cpp: Fix compiler warning.
Change-Id: Ibdb57f99b98b0c603be3c9be043737687034a958
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Stephen Kelly [Tue, 10 Jan 2012 13:46:34 +0000 (14:46 +0100)]
Add QModelIndex as a built-in metatype.
Change-Id: Ib87cfff8b4baee78189f3df5e20d2e1a00d690e1
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Tor Arne Vestbø [Tue, 10 Jan 2012 13:24:59 +0000 (14:24 +0100)]
Don't enable V8's snapshot feature when building inside scratchbox for ARM
It will result in QEMU crashing.
Change-Id: Ie2f607b6335ae0d08b9a6d67acc22ea666bcd780
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Harald Fernengel [Wed, 11 Jan 2012 12:27:12 +0000 (13:27 +0100)]
Fix Q_ASSERT_X to handle QT_FORCE_ASSERTS
This change aligns the behavior of Q_ASSERT and Q_ASSERT_X
Change-Id: Iac9f399da6462fcf70826d3ce1177522bed9f897
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Pekka Vuorela [Thu, 5 Jan 2012 16:03:49 +0000 (18:03 +0200)]
Input direction/locale to come from platform input context
Change-Id: Ib049693211a08dcffc9dbe49add54e7feab38978
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Frederik Gladhorn [Mon, 9 Jan 2012 12:13:33 +0000 (13:13 +0100)]
Make QAccessibleInterface::indexOfChild() 0-based.
Makes the code nicer and more consistent with the rest of the world.
Change-Id: I5ba0ee39f5b0afd1a079a3cea9990d123955ed3f
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Morten Johan Sorvig [Tue, 10 Jan 2012 10:54:54 +0000 (11:54 +0100)]
Add support for accessibility actions.
Match Cocoa and Qt actions manually. Some have no
corresponding action on the other side.
Change-Id: I775cb8987ab843bd88d57d856ef7c0403290db00
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
C. Boemann [Mon, 2 Jan 2012 13:42:57 +0000 (14:42 +0100)]
Add methods for font stretch and absolute letter spacing
We basicaly just rely on the methods in QFont
Change-Id: Iaf8cbf4d90d0c5b10b3a85983de7ca58763e0371
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Morten Sorvig [Tue, 27 Sep 2011 12:39:48 +0000 (14:39 +0200)]
Remove universal build support from configure.
Qt 5 will support single-arch builds only, for two
reasons:
1) PPC is very deprecated at this point, x86_64
is becoming standard.
2) V8 only supports single arch builds.
As a workaround, build twice and use lipo to
create universal binaries.
This commit also removes the -cocoa and -carbon
options.
Change-Id: I428f096a02f59ec2b3e693150e0e08358198de83
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Jędrzej Nowacki [Mon, 5 Dec 2011 14:52:13 +0000 (15:52 +0100)]
Remove redundant parameter from qVariantToHelper.
Change-Id: I3664a74eb8602651547c0c80dc4f628f909d97b4
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Kurt Korbatits [Tue, 10 Jan 2012 03:46:12 +0000 (13:46 +1000)]
Changed selftests unittest to not fail but warn when valgrind not installed.
- Changed to detect valgrind at runtime and skip test instead of failing.
- subprograms inherit QT_QPA_PLATFORM value from parent if set.
Change-Id: I280acee389df1ee74ee6758a0dd1601226e103c7
Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Kurt Korbatits [Tue, 10 Jan 2012 00:38:51 +0000 (10:38 +1000)]
Changed selftests unittest to work from installation directory.
- All subprograms installed as part of test instead of separate installs
- Added installTestHelperApp() to testcase.prf
Change-Id: I02fbbb299f095054c9216ad0e5f91f574fb0fe3d
Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Stephen Kelly [Tue, 10 Jan 2012 04:30:31 +0000 (05:30 +0100)]
Make modules find their own dependencies.
Change-Id: I4a7b96d33417a15d79f3932ced91bee58915c83f
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Albert Astals Cid [Tue, 10 Jan 2012 14:32:51 +0000 (15:32 +0100)]
Match the name in the cpp file
Which is actually the name Lars wanted i just forgot to fix it everywhere
Change-Id: Iaa190da6c17d0a423c34202c986d69feec01af96
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Friedemann Kleint [Mon, 9 Jan 2012 14:36:02 +0000 (15:36 +0100)]
Introduce a QVariant themeHint() to QPlatformTheme.
Start on removing platform-specific code from QtWidgets.
Change-Id: Ic2163a0ce6f2db2151cdf7ca93766b2d861eeb55
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Frederik Gladhorn [Mon, 9 Jan 2012 20:05:09 +0000 (21:05 +0100)]
Document enum value QAccessible::Expandable.
Change-Id: I5280bf3eadf7ef876f89de318a4d6168078d929e
Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
Frederik Gladhorn [Mon, 9 Jan 2012 19:57:44 +0000 (20:57 +0100)]
Accessibility docs: interfaces: value/action/text.
Change-Id: Ic57305cf9c008c8e861c1bdc66886b43d78c2d76
Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
Frederik Gladhorn [Mon, 9 Jan 2012 18:15:13 +0000 (19:15 +0100)]
Improve Accessibility documentation 2.
More cleanup, make sure links work.
Change-Id: If72f9cfc0d44aa1fb261be2aace8ddd457295993
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Mark Brand [Mon, 21 Nov 2011 07:56:19 +0000 (08:56 +0100)]
use "cp -R" instead of "cp -r" for *bsd compatibility
Change-Id: Ib013e2d36645a782249b543ec9301902484a7708
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Friedemann Kleint [Tue, 10 Jan 2012 09:13:55 +0000 (10:13 +0100)]
Tests: Remove duplicate QTRY_VERIFY/QTRY_COMPARE macros in bearer.
Introduce QTRY_VERIFY_WITH_TIMEOUT and QTRY_COMPARE_WITH_TIMEOUT
to be able to specify a timeout value.
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Change-Id: Iaeaa4938eb14f2c431537055f626510cba183ce3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Friedemann Kleint [Tue, 10 Jan 2012 11:16:33 +0000 (12:16 +0100)]
tst_qgraphicsivew: Run Motif scrollbar range tests only at 96DPI.
Preparing the introduction of a change that uses the actual
QScreen resolution in the style helper.
Change-Id: I3fbb36b0d6a34904c875a2e3684d73124f534bed
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Friedemann Kleint [Tue, 10 Jan 2012 14:58:31 +0000 (15:58 +0100)]
Fix QWidget::saveGeometry().
Bring back code that was accidentally removed.
Change-Id: Ie1a4d22caa206bc8bb8e678879935e79009e9622
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Robin Burchell [Thu, 29 Dec 2011 22:56:27 +0000 (23:56 +0100)]
Remove thread from QFileSystemWatcherEngine implementations.
These threads are actually counterproductive, as generally speaking, processing
watches is not that expensive an operation, so instead, they process at full
speed and can (in the case of slow processing in the thread processing the
events) stack up and consume resources for no good reason.
Threads also have an additional resource consumption per engine (some ~8mb of
thread stack on Linux), so doing away with them is nice.
A side effect of this change is that events are now effectively rate-limited by
the eventloop speed of the thread they run in, so if your thread runs too slow,
and you recieve a lot of events, on some platforms, events may be dropped now
where in the past, they would be read by the monitor thread and turned into Qt
signals (thus not visibly showing as a problem, apart from invisibly bloating
memory usage).
Task-number: QTBUG-20028
Change-Id: I345a56a8c709f6f778ca9a0b55b57c05229ba477
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Oswald Buddenhagen [Mon, 9 Jan 2012 18:25:44 +0000 (19:25 +0100)]
QMap => QHash
this should make the evaluator quite a lot faster. the total win for
qtbase/src is only 6%, though.
i made some effort to avoid that output files get randomized. however, i
didn't bother to keep debug output sorted.
Change-Id: Id9cef4674c0153c11ebbb65cb63bf8c229eb56e3
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Stephen Kelly [Mon, 9 Jan 2012 18:03:48 +0000 (19:03 +0100)]
Don't use check as an identifier in the configure app.
Avoids conflict with macro on Mac OS.
Change-Id: I3426c2dc514240d80996d823b7a552c13a09f99e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Stephen Kelly [Mon, 9 Jan 2012 12:01:23 +0000 (13:01 +0100)]
Rename internal method check to doCheck
Mac OSX has a check macro in /usr/include/AssertMacros.h which can
conflict with this API if used together.
http://boost.2283326.n4.nabble.com/Boost-with-Darwin-Mac-gcc-4-0-1-td2580330.html
Change-Id: I93ddd08fa2b51b198bbc02ce501d79ed97a32c34
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Stephen Kelly [Sun, 8 Jan 2012 18:58:43 +0000 (19:58 +0100)]
Add defines for explicit virtual overrides.
Change-Id: Ia9a610e81eeaaa0a08ca6ef4945b002bdb13fe8a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Stephen Kelly [Fri, 6 Jan 2012 07:02:19 +0000 (08:02 +0100)]
Make the supportedDragActions a virtual accessor.
Change-Id: I4001fcabc67e5b46465b3c9111c33247c52e5788
Reviewed-by: David Faure <faure@kde.org>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: David Faure <david.faure@kdab.com>
Friedemann Kleint [Tue, 10 Jan 2012 13:57:16 +0000 (14:57 +0100)]
Fix a crash in QDialog.
Call d->helperDone before deleting 'this'.
Change-Id: I06224f4d3a868dccd505b1f1d3ed56af6f339ba3
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Bradley T. Hughes [Tue, 10 Jan 2012 12:43:51 +0000 (13:43 +0100)]
Document timer accuracy behavior on UNIX.
Change-Id: I5e8b383cc4d8ce0d249be164c5ef596328bdc50c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Bradley T. Hughes [Tue, 10 Jan 2012 07:49:42 +0000 (08:49 +0100)]
Remove win*Message() exported functions
They are nothing more than wrappers around the Win32 API, and marked
for removable in Qt 5.
Change-Id: Iaf34d463488feb7840185c7b46f65a031232e34a
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Bradley T. Hughes [Tue, 10 Jan 2012 09:34:30 +0000 (10:34 +0100)]
Use Qt::TimerType on Windows when starting timers
Make all Qt::PreciseTimers and timers with intervals < 20ms use
Multimedia timers for maximum accuracy. Qt::CoarseTimers and
Qt::VeryCoarseTimers use normal Windows timers, with
Qt::VeryCoarseTimers having their interval rounded to the nearest
full second.
Note that the Windows timer implementation does not attempt to align
timers and reduce CPU wakeups like the UNIX implementation does. This
might be done in the future, though. However, this change does the
best we can do now, keeping most timers working as-is, while allowing
explicit use of Multimedia timers via Qt::PreciseTimer.
Change-Id: I1898272b101c572a2a9b9454fef27a651eb178f5
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Stephen Kelly [Tue, 27 Dec 2011 16:02:33 +0000 (17:02 +0100)]
Make the roleNames a virtual accessor.
This is consistent with the rest of the API of QAbstractItemModel
(which is virtual) and removes the need for code like this
in the constructor (where it doesn't belong):
QHash<int, QByteArray> myRoleNames = roleNames();
myRoleNames.insert(Qt::UserRole + 1, "myCustomRole");
setRoleNames(myRoleNames);
in favor of
MyModel::roleNames() const {
QHash<int, QByteArray> myRoleNames = QAbstractItemModel::roleNames();
myRoleNames.insert(Qt::UserRole + 1, "myCustomRole");
return myRoleNames;
}
which is consistent with all other QAIM API (eg, flags()).
This is a source compatible change.
Change-Id: I7e1ce17f8dab2292c4c7b6dbd3c09ec71b5c793b
Reviewed-by: David Faure <faure@kde.org>
Reviewed-by: Marius Bugge Monsen <marius@cutehacks.com>
Frederik Gladhorn [Sat, 7 Jan 2012 01:24:03 +0000 (02:24 +0100)]
Generate docs for accessible interfaces.
Change-Id: Ic385dd416a6d6bce1b999e14a4b36cdd06127ff1
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Jørgen Lind [Mon, 9 Jan 2012 07:54:11 +0000 (08:54 +0100)]
We should return texture id 0 for invalid images and pixmaps
in the texture cache
Change-Id: Ib9bb136fa451c571fce2adbee29998b3f3593b31
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Jędrzej Nowacki [Mon, 5 Dec 2011 11:43:10 +0000 (12:43 +0100)]
Reimplement QVariant to QDebug streaming.
New implementation fixes some commented code marked as FIXME.
Change-Id: If8f5bebedd65bcf8f839d804c2022ca79ef82ddf
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Friedemann Kleint [Mon, 9 Jan 2012 12:11:14 +0000 (13:11 +0100)]
Platform style hints: Introduce keyboard repeat rate.
Change-Id: I556c2ecec7d5368122875a659af3ae7db88aa481
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Zeno Albisser [Sat, 7 Jan 2012 15:37:07 +0000 (16:37 +0100)]
Fix key codes on mac.
Qt key codes match the unicode character in upper case format.
Change-Id: I92b43463921e71f2607e569ba7ee23d6f844c50a
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Frederik Gladhorn [Thu, 5 Jan 2012 12:57:33 +0000 (13:57 +0100)]
Accessiblity State as bit field.
We would like to add more flags that will be over the 32 bit boundary.
On Windows enums don't seem to digest values >32 bit.
This patch changes the state flags to be a bit field instead.
The windows part of the patch was written by Jan-Arve Sæther.
Change-Id: I2d1d87807f920ce4d4a5c7bfea8b1122ed44eb08
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Jason McDonald [Tue, 10 Jan 2012 04:27:33 +0000 (14:27 +1000)]
Update year in Nokia copyright headers.
The previous change missed some headers from years prior to 2011, and a
few new files were merged after the previous change.
Change-Id: Ib7d1a2b7062228c2a5373da64242b2ee1f0981e1
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Xizhi Zhu [Tue, 10 Jan 2012 02:58:58 +0000 (04:58 +0200)]
Remove the unused QTRY_COMPARE macro from bearer auto tests.
The custom QTRY_VERIFY macro is needed since the one provided by testlib does
not support custom timeout.
Change-Id: I12bbc5efcb16c4f53514ad738d6115d217a55b05
Reviewed-by: Alex <alex.blasche@nokia.com>
Xizhi Zhu [Tue, 10 Jan 2012 02:41:30 +0000 (04:41 +0200)]
Remove ICD plugin for bearer.
It's only used by Maemo and Harmattan, thus not needed in Qt5.
Change-Id: I8638f4fc63637be88d1aa584cde7e3a4116f2de6
Reviewed-by: Alex <alex.blasche@nokia.com>
Stephen Kelly [Mon, 9 Jan 2012 17:44:40 +0000 (18:44 +0100)]
Rename check to checkEvent.
Avoids conflict with macro on Mac OS.
Change-Id: I1b597205c32531e054832fcb396622b47b18040a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Liang Qi [Wed, 4 Jan 2012 10:15:20 +0000 (11:15 +0100)]
Add V3(md5) and V5(sha1) version for DCE in QUuid
Add the above versions based on RFC4122 standard.
Done-with: Hagen Rother
Task-number: QTBUG-23071
Change-Id: Ieb90925374d1e3c85011b899b8dd3bb1a608c561
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Kurt Korbatits [Tue, 10 Jan 2012 00:28:42 +0000 (10:28 +1000)]
Changed selftests unittest to use specific headers instead of QtCore.
Changed selftests unittest to use specific classes of QtCore instead of
pulling in all of QtCore headers by using include <QtCore>
- Decreasing build time.
Change-Id: Ic53a70423ecafeb342cc05ae6d7dee795533d205
Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Jason McDonald [Mon, 9 Jan 2012 23:53:44 +0000 (09:53 +1000)]
Improve QDateTimeEdit autotest.
Reinstate a check that was presumably disabled because it wasn't
checking for the right expected date. At present pressing Enter in a
QDateTimeEdit without changing the date still emits the dataChanged()
signal. By reinstating the test, we ensure that the behaviour can't
change by accident.
Change-Id: I1b766af6ced001a4191606247338dbc91049cb8d
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Stephen Kelly [Mon, 9 Jan 2012 15:37:14 +0000 (16:37 +0100)]
Remove symbian debug macro definition.
Change-Id: I3c4cc5cfd8e157587dbda1589501bb829a5a18db
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
David Faure [Tue, 3 Jan 2012 12:34:49 +0000 (13:34 +0100)]
If decodestring can't translate the string return Qt::Key_unknown.
Change-Id: Ie082b326e944a28b4e29984a527e3841a05b32f6
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Samuel Rødal [Mon, 9 Jan 2012 08:50:08 +0000 (09:50 +0100)]
Lock X display while calling XESetWireToEvent and its callback.
Prevent potential race conditions as suggested by Uli Schlachter.
Change-Id: Ia93eb8be1cbbc3d8ae7913a934c195af6b5ec538
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Uli Schlachter <psychon@znc.in>
Sami Rosendahl [Mon, 9 Jan 2012 13:29:53 +0000 (15:29 +0200)]
Fix memory leak in QDomDocument entity text expansion
The created entity node's reference count needs to be decremented to 0
before it is added as a child, because appendChild will increment the
reference count to correct value of 1. Re-enabled commented-out test data
tst_QDom::setContent to exercise the code path with the leak.
Change-Id: Ieb015d68ba9bbb3f20dd47e76835ad15abb1738e
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Stephen Kelly [Mon, 9 Jan 2012 18:14:27 +0000 (19:14 +0100)]
Avoid using 'check' as an identifier.
Avoids conflict with macro on Mac OS.
Change-Id: I79d78283b45bc97032d6a94139ee750ec01e9c0a
Reviewed-by: hjk <qthjk@ovi.com>
Stephen Kelly [Mon, 9 Jan 2012 18:08:08 +0000 (19:08 +0100)]
Avoid using check as an identifier.
Avoids conflict with Mac OS.
Change-Id: I72a1218d101fdf2fa40f80934a6157ed26e699a1
Reviewed-by: hjk <qthjk@ovi.com>
Stephen Kelly [Mon, 9 Jan 2012 18:06:39 +0000 (19:06 +0100)]
Avoid using check as an identifier.
Avoids conflict with Mac OS.
Change-Id: I64856a64808dcd481f6075eb4f3a7cc19950bad3
Reviewed-by: hjk <qthjk@ovi.com>