Robin Burchell [Sat, 21 Jan 2012 14:09:51 +0000 (16:09 +0200)]
Remove uses of qMalloc/qFree from out of line code.
There is no need to use these, and we are trying to deprecate them.
Change-Id: I70e6f27aca322fe74c31d8ad8496f230cd29e503
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Friedemann Kleint [Wed, 18 Jan 2012 10:02:48 +0000 (11:02 +0100)]
Fixed qtmodule-configtests on Windows.
open() to "|-" and "-|" are unsupported on Windows (see `perldoc
perlport'), so don't do that.
Let the tests write a 'config.log' file which contains the output
of the test commands.
Brings back the part fixing the pipe logic from commit
f865dc1ae44c88f6965acd09bafb01829c35447b which was reverted.
Change-Id: I5060a0885702d925001b98f2d4e84743d6ff226e
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Friedemann Kleint [Fri, 20 Jan 2012 15:49:44 +0000 (16:49 +0100)]
Windows: Implement native event filters.
Change-Id: Ibdf556428e4dbb9156c87504b923ec9600bcf871
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Friedemann Kleint [Sun, 22 Jan 2012 20:05:06 +0000 (21:05 +0100)]
XCB: Introduce enumeration for event filter types.
Remove QByteArray-construction and hash lookup in the event
handling; use an enumeration indexing an array instead.
Change-Id: I4d272b32a5ff71c8da58197cf3a0b38c1e61d489
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Alex Wilson [Mon, 23 Jan 2012 07:02:38 +0000 (17:02 +1000)]
Mark QTriangulatingStroker as Q_GUI_EXPORT
Change-Id: I6083ba122c33769cd4626f2c4a32959e535da8a4
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Joerg Bornemann [Sat, 21 Jan 2012 17:04:23 +0000 (18:04 +0100)]
qfilesystemengine_win.cpp: compile with namespaced Qt
SidCleanup struct must not be in the INCLUDE_NAMESPACE.
Change-Id: Ic51f1734af583c0ba7f715f7b27f314211e698c5
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
Uli Schlachter [Sun, 22 Jan 2012 20:03:12 +0000 (21:03 +0100)]
xcb: Correctly check the X11 connection
Commit
e08453f31ae2a195f86a763f0b1c5e617df0e1ce added a check which makes
sure qt prints an error message instead of segfaulting when it can't
connect to the X11 server.
However, libxcb will never return NULL from xcb_connect() and thus that
commit only works if XCB_USE_XLIB is defined and used.
Change-Id: I8cc1496494a94f07055a3ac5093ce362dd347c5b
Signed-off-by: Uli Schlachter <psychon@znc.in>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Xizhi Zhu [Sun, 22 Jan 2012 15:35:03 +0000 (16:35 +0100)]
Remove Symbian specific code from QtXml.
Change-Id: I29979c80e401f5d6c2c2b38c4e502340f2025a12
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Xizhi Zhu [Sun, 22 Jan 2012 15:34:40 +0000 (16:34 +0100)]
Remove Symbian specific code from QtSql.
Change-Id: I3fc538862c7334914ec9e4331ef2d3db5c699ea9
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Uli Schlachter [Sun, 22 Jan 2012 19:41:42 +0000 (20:41 +0100)]
xcb: Don't crash on missing mouse pointer
The draganddrop examples all crashed here because they were using a
default-constructed QImage() (i.e. one without any content).
I guess this happens here because I don't have any mouse theme set.
To test, one could start a second X server, but without any WM or DE.
The "evil" QImage() came from QGuiApplicationPrivate::getPixmapCursor().
This function seems to just always "return QPixmap();".
This fix is correct because the only caller has another fallback if the
createNonStandardCursor()-fallback didn't work. This caller is
QXcbCursor::createFontCursor().
Change-Id: I7ec7fbcfdf0203e983149b5e73016cc7e85ecf40
Signed-off-by: Uli Schlachter <psychon@znc.in>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Richard Moore [Sun, 22 Jan 2012 21:03:27 +0000 (21:03 +0000)]
Remove dead code.
Task-number: QTBUG-23524
Change-Id: I6a80af450b599022e9242cccec945887b871f2b0
Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com>
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Richard Moore [Sun, 22 Jan 2012 22:18:29 +0000 (22:18 +0000)]
Remove invalid comment.
No point in making this protected: it breaks existing code including
the unit tests, and the base class has this method as public.
Task-number: QTBUG-23524
Change-Id: I8fae019088fc368213ff7caa4b19fe7ab60488dd
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Bradley T. Hughes [Wed, 18 Jan 2012 07:49:49 +0000 (08:49 +0100)]
Expect tst_QWizard::setPixmap() failure on Mac OS X
Task-number: QTBUG-23701
Change-Id: Iba5b926e57c1565856d17bbfbff4d1da75645ad4
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Bradley T. Hughes [Wed, 18 Jan 2012 08:05:00 +0000 (09:05 +0100)]
Expect tst_QFileDilaog:clearLineEdit() failure on Mac OS X
Task-number: QTBUG-23703
Change-Id: I981de80d6946d3637c493bede0adb1b90a539261
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Bradley T. Hughes [Wed, 18 Jan 2012 07:55:54 +0000 (08:55 +0100)]
Do not expect tst_QFileDialog::selectFiles() failure on Mac OS X
This test no longer fails:
XPASS : tst_QFiledialog::selectFiles() '!listView->selectionModel()-
Loc: [tst_qfiledialog.cpp(915)]
Change-Id: Ib790c0f81b3d383117cceceaacbf0c3d6a673404
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Bradley T. Hughes [Wed, 18 Jan 2012 07:40:03 +0000 (08:40 +0100)]
Do not mark tst_QGraphicsWidget as insignificant anymore
Allow new failures in this test to block CI.
Change-Id: I1c7e797740be2f77f82d00943f6f2018b686481f
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Bradley T. Hughes [Wed, 18 Jan 2012 07:39:00 +0000 (08:39 +0100)]
Expect tst_QGraphicsWidget::updateFocusChain...() failure on Mac OS X
tst_QGraphicsWidget::updateFocusChainWhenChildDie() currently fails due
to what appears to be window activation.
Task-number: QTBUG-23699
Change-Id: I404f90d32dba64d558598d97cf805b6c025e6456
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Bradley T. Hughes [Wed, 18 Jan 2012 07:30:53 +0000 (08:30 +0100)]
Fix XPASS in tst_QGraphicsWidget on Mac OS X
Don't expect failure from these 2 tests anymore:
XPASS : tst_QGraphicsWidget::initStyleOption(all) COMPARE()
Loc: [tst_qgraphicswidget.cpp(1162)]
XPASS : tst_QGraphicsWidget::initialShow2() COMPARE()
Loc: [tst_qgraphicswidget.cpp(3196)]
Change-Id: Ibd1178f8cab480fa9fad9c829083a4862749c60b
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Bradley T. Hughes [Tue, 17 Jan 2012 13:43:47 +0000 (14:43 +0100)]
Fix XPASS in tst_QGraphicsView on Mac OS X
These tests now fail with XPASS on Mac OS X, so remove/skip the
QEXPECTED_FAIL(). Unfortunately we don't know which commit fixed this.
Change-Id: Id919a2c9d56fd7c4dee8ccb8aa3293efdce603b2
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Bradley T. Hughes [Wed, 18 Jan 2012 07:42:54 +0000 (08:42 +0100)]
Expect tst_QGraphicsProxyWidget::updateAndDelete() failure on Mac OS X
Task-number: QTBUG-23700
Change-Id: Ic472cea966761afc1e6e17479588b8b53ec4786c
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Bradley T. Hughes [Mon, 16 Jan 2012 10:49:53 +0000 (11:49 +0100)]
Replace Q_WS_MAC with Q_OS_MAC in tests/auto/widgets
tst_qwidget.cpp will not build/link without tst_qwidget_mac_helpers.mm,
so re-add it to the build as well.
Change-Id: I55130f62c215c4b82683d90456e31fdb09f833a8
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Robin Burchell [Thu, 19 Jan 2012 23:55:51 +0000 (01:55 +0200)]
Blow up earlier when adding test rows without columns.
Previously, the assertation triggered was rather unhelpful:
QFATAL : tst_QHash::qhash_qt4() ASSERT: "d->dataCount <
d->parent->elementCount()" in file qtestdata.cpp, line 88"
We now try a bit harder to be user-friendly.
Change-Id: I2e3a5ae27914d44fc1dc89af2a084e3d798fe221
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Jason McDonald [Fri, 20 Jan 2012 03:21:44 +0000 (13:21 +1000)]
Update obsolete contact address.
Replace Nokia contact email address with Qt Project website.
Change-Id: Id689fdb78727abafba033bed7b0402e2cf27aba1
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Fri, 20 Jan 2012 03:06:31 +0000 (13:06 +1000)]
Update contact information in license headers.
Replace Nokia contact email address with Qt Project website.
Change-Id: I431bbbf76d7c27d8b502f87947675c116994c415
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Rohan McGovern [Mon, 23 Jan 2012 00:28:06 +0000 (10:28 +1000)]
Mark tst_qhostinfo as insignificant on Linux.
This test sometimes gives different results on consecutive runs, and is
therefore insignificant for the purpose of regression detection.
Task-number: QTBUG-23837
Change-Id: I8747972c5cb7952089c54cbd22e1660db551e2f5
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Harald Fernengel [Wed, 18 Jan 2012 20:28:31 +0000 (21:28 +0100)]
Remove dependency of QtDBus onto QtXml
Replace the QDom based code in qdbusxmlparser
with code using QXmlStreamReader.
Task-number: QTBUG-20856
Change-Id: I294e3ebd6faa813c20806be3ae225ac00befb622
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Robin Burchell [Fri, 20 Jan 2012 00:30:02 +0000 (02:30 +0200)]
Obsolete QInputDialog::getInteger() 'officially'.
It has long since been obsolete in code and removed from the documentation, but
was never marked QT_DEPRECATED. Do so, and inline the implementation.
Change-Id: Ic7bfdaf76269b7f9addeba83e64bc9525c581dda
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Xizhi Zhu [Sat, 21 Jan 2012 19:48:39 +0000 (20:48 +0100)]
Update the documentation for bearer.
Removed the reference to Symbian plugin, and added the reference to
ConnMan / oFono plugin.
Change-Id: I6a2ea9159aaa05bf4109bae97889d126a324ef8b
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Alex <alex.blasche@nokia.com>
Robin Burchell [Sat, 21 Jan 2012 17:37:39 +0000 (19:37 +0200)]
Merge overloads of QInputDialog::getText() and QInputDialog::getItem()
Change-Id: Ifaefaa5c3faa698c8570da4ef00e130c211b2609
Reviewed-by: Richard J. Moore <rich@kde.org>
Robin Burchell [Fri, 20 Jan 2012 00:23:16 +0000 (02:23 +0200)]
Merge overloads of QFontDialog::getFont().
Per Qt 5 comment. Note that this leaves one overload of getFont() intact, as
removing it would be a source-incompatible change.
Change-Id: Ieb6ddfef9aa86750c14928ab2e0a9bfb84d322ab
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Robin Burchell [Fri, 20 Jan 2012 00:17:09 +0000 (02:17 +0200)]
Remove note about source-incompatible change.
There's no real gain to be had from doing this.
Change-Id: Ifa5fefe4a354cfe1f9a8a915a7041d0cfebccce1
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Richard J. Moore <rich@kde.org>
Robin Burchell [Fri, 20 Jan 2012 15:27:47 +0000 (17:27 +0200)]
Remove copy of libgq.
Nothing in the source tree uses this after the removal of the icd bearer plugin
in
0e0eb207c4ada7a09c980b816dda1c5c6af1c027, so there is no point keeping it
around anymore.
Change-Id: I6ea05c84d561965636e2ca5b03c7ee8edc48c093
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Richard J. Moore <rich@kde.org>
Robin Burchell [Fri, 20 Jan 2012 00:35:51 +0000 (02:35 +0200)]
Remove unnecessary sizehint overload.
Change-Id: Id6b3e206d59df25f6252da48ac99265226313635
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Richard J. Moore <rich@kde.org>
Thorbjørn Lund Martsum [Sat, 7 Jan 2012 07:23:17 +0000 (08:23 +0100)]
Change QMessageBox::question to default to yes/no buttons instead of ok
Beside that it also removes a suggestion about making Ok==Yes and
No==Cancel. It would be a problem since we (at least)
can have messageboxes with both yes, no and cancel.
Change-Id: I567979b2e697e7103968d6512fe4835f86888ca3
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Robin Burchell [Sat, 21 Jan 2012 11:45:44 +0000 (13:45 +0200)]
Introduce a qalgorithms benchmark.
Based on the unit test for data production.
Change-Id: I88a411c0079b251d3682c3fbf9fe7ed1b5457a7e
Reviewed-by: Anselmo L. S. Melo <anselmo.melo@openbossa.org>
Reviewed-by: Richard J. Moore <rich@kde.org>
Robin Burchell [Sat, 21 Jan 2012 11:54:36 +0000 (13:54 +0200)]
Minor style fixups.
Add spaces where necessary, and pull braces back to the same line.
Change-Id: If543686c9727a110f8a91f1a88e08d5d2ac12284
Reviewed-by: Richard J. Moore <rich@kde.org>
Robin Burchell [Fri, 20 Jan 2012 11:15:13 +0000 (13:15 +0200)]
Fix incorrect check for error when monitoring a path using inotify.
Per the manpage, inotify_add_watch will return -1 in the case of error, 0 is
a valid watch descriptor.
Task-number: QTBUG-12564
Change-Id: I56a54de2f5cf18b40aaeddc6de51d18dacbf8daf
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Mark Brand [Thu, 12 Jan 2012 09:43:29 +0000 (10:43 +0100)]
remove obsolete codec plugin loading code
Change-Id: I1f3dbb5c10009413f701947b1b89ed3dbc94bf3d
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Mark Brand [Sun, 3 Jul 2011 19:53:27 +0000 (21:53 +0200)]
cosmetic adjustments for files moved to core/codecs
-update old reference to 'plugin'
-rename multiple inclusion guards
-add private header warning text
Change-Id: I4c582dcba549d871bd8d929bee5372586117eabb
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Mark Brand [Wed, 18 Jan 2012 20:01:26 +0000 (21:01 +0100)]
update private header references
Change-Id: I092d879653b6900532a0c4534c1eb2be84e9d0f6
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Mark Brand [Thu, 12 Jan 2012 23:24:13 +0000 (00:24 +0100)]
move plugin text codecs to QtCore
Having plugin text codecs adds considerable complexity to
configuring Qt. The plugin interface is designed for optional
features, but text codecs tend to be used for essential functions.
A dramatic example is loading a codec plugin from a file whose path
needs to be converted by the codec.
Codec plugins can also be a nuisance to builders of applications
linking to static Qt. This is because the application might need
to explicilty import the static codec plugins which are actually
dependencies of QtCore.
For these reasons, it has been decided not to have text codec plugins
any longer.
Change-Id: Ic6c80a9c949bd42e881e932d1edae23fe4fe4c88
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Mark Brand [Sun, 3 Jul 2011 22:42:24 +0000 (00:42 +0200)]
build and load text codecs regardless of iconv and platform
Otherwise applications linking to static Qt may have to import
the static plugins to avoid linking failure even if they do not
use the codecs, which is a nuisance.
Also, this is preparation for moving these codecs into QtCore
proper.
Change-Id: I71f3bbb0bac6261983143d0578757b34997d1364
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Shane Kearns [Thu, 19 Jan 2012 15:12:29 +0000 (15:12 +0000)]
QFileInfo autotest - don't fail on default configured windows systems
NTFS file access times are disabled by default since windows 6 for
performance reasons. The test now checks the registry setting and
reports XFAIL if access times are disabled.
Change-Id: Ia84ed0c8736e6c7d5817425006f6115d9f3e70a4
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Friedemann Kleint [Fri, 20 Jan 2012 08:15:13 +0000 (09:15 +0100)]
QPA/windows example: Fix positioning for virtual desktops.
Position window within screen geometry.
Change-Id: Id931f386c9ef5564887a2f54b71921f062320f54
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Mark Brand [Wed, 18 Jan 2012 10:43:10 +0000 (11:43 +0100)]
fix whitespace
Change-Id: I0cfccae085c000d4368386a34f288c1e6f01a88f
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Morten Johan Sorvig [Fri, 13 Jan 2012 07:55:43 +0000 (08:55 +0100)]
Add atomic implementation for Native Client.
Uses gcc compiler intrinsics, similar to avr32.
Change-Id: I10cc2bd3cad67ee002386bab1ea764a4ff5ce727
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Pasi Matilainen [Tue, 17 Jan 2012 11:08:42 +0000 (13:08 +0200)]
Fix cursor disappearance in QLineEdit on Mac when deleting all text
On Mac OS X, if all text in the QLineEdit was selected and then deleted, cursor
visibility was not updated, and so the cursor remained hidden. Fixed
to update cursor visibility also when the text is empty.
Task-number: QTBUG-13169
Change-Id: Id52a20b07bb96609a78c42eb630ee2b20ed7cbcb
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
(cherry picked from commit
181456d0a31b7250da97eafba75e6bc657391777)
Joerg Bornemann [Fri, 20 Jan 2012 13:13:09 +0000 (14:13 +0100)]
make tst_QProcess::softExitInSlots pass in under 120 seconds
Due to unconditional waits this test always needed 120 seconds to pass.
Now we're using QTRY_VERIFY and make sure that we write the data before
the process got killed even in the cases 3 and 4.
On my machine this test now takes 8 seconds.
Change-Id: I606a8b43ba4c97704be5202a6c5d8d1c75337f9c
Reviewed-by: Bill King <bill.king@nokia.com>
Jiang Jiang [Thu, 19 Jan 2012 15:30:03 +0000 (16:30 +0100)]
Fix glyphsEnd range check
For a character generating more than one glyphs, glyphsRun() needs
to check the next glyph index after the requested range. If that
glyph index is more than one larger than the glyphsEnd we currently
get from logClusters, then glyphsEnd need to be set to the next
glyph index minus one.
Change-Id: I795c595d349418ba755b088d6fe6ff24a6e7dd15
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Friedemann Kleint [Fri, 20 Jan 2012 10:34:09 +0000 (11:34 +0100)]
Windows: Work on QPlatformScreen implementation.
Implement virtual desktops (which is the default for
EnumDisplayMonitors) and change notifications.
Change-Id: Id24a1b6d9766903901ddf1ded8e9933aa03589d4
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
Friedemann Kleint [Thu, 22 Dec 2011 13:51:47 +0000 (14:51 +0100)]
uic: Add translation-attributes to string list properties.
Task-number: QTBUG-8926
Task-number: QTBUG-20440
Change-Id: I57d92110bf532c717451336bd1943c9571020478
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Friedemann Kleint [Fri, 20 Jan 2012 07:57:17 +0000 (08:57 +0100)]
Add a virtual sendPostedEvents() to QEventDispatcherWin32.
Reimplement this in QWindowGuiEventDispatcher to send both Qt posted events and
queued QPA window system events. We need to do this at a well defined place,
instead of sending events outside of the eventloop from the Windows proc.
This fixes various hangs for example in tst_qinputdialog, which used a 0-timer
to close a dialog.
Change-Id: I64e0b8f1209fb434059a7fa667ed585902c19db4
Initial-patch-by: bhughes <bradley.hughes@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Eskil Abrahamsen Blomfeldt [Fri, 18 Nov 2011 09:24:32 +0000 (10:24 +0100)]
Introducing QPlatformSharedGraphicsCache
Interface to provide cross-process caching mechanisms in a platform
plugin. Can be used for shared glyph caches and icon caches etc.
Change-Id: If0d89a0a50bbd6eee05daf908448262ff270fc5b
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
David Faure [Fri, 20 Jan 2012 10:22:09 +0000 (11:22 +0100)]
Remove QBool and use bool instead.
QBool was introduced with Qt-4.0, to detect Qt3-like code like
if (c.contains(d) == 2) and break compilation on such constructs.
This isn't necessary anymore, given that such code couldn't possibly
compile in Qt4 times.
And QBool was confusing developers, and creating compile errors (e.g.
QVariant doesn't have support for it), so better remove it for Qt 5.
Change-Id: I6642f43f5e12b872f98abb56600186179f072b09
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Anselmo L. S. Melo [Thu, 19 Jan 2012 18:27:40 +0000 (15:27 -0300)]
Docs: Fix typo in the QWindow class documentation
It was 'windw' instead of 'window'
Change-Id: I3a7b361a22e4ea09ee1fb3d9b551c1a88d401ff1
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Simon Hausmann [Thu, 19 Jan 2012 14:24:57 +0000 (15:24 +0100)]
Allow generic plugins to set defaults for window system properties
In order for generic plugins to set defaults on "startup" time - such
as the meego integration plugin to set the correct screen orientation -
it is necessary to construct the plugins when the application startup is
done. Then the plugin can "inject" the values the usual way, using
QWindowSystemInterface::handle*Change. Afterwards we need to process those
events - take them from the window system event queue and let QGuiApplication
process them.
Change-Id: I84de022ad565a33ae3ef5dfc34f540d6bf488b03
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Simon Hausmann [Wed, 18 Jan 2012 14:16:09 +0000 (15:16 +0100)]
Add support for platform plugin specific event filters.
The setEventFilter on the platform native interface allows subscribing to
events on the backend by event name.
Change-Id: Ib10077fbc69f0207edbae1177e7bbd18c8d0f9ae
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Reviewed-by: Michalina Ziemba <michalina.ziemba@nokia.com>
Robin Burchell [Wed, 18 Jan 2012 16:02:24 +0000 (18:02 +0200)]
Add a string hash implementation similar to the one in Java.
This uses a similar runtime to the approach of sampling part of the string, with
the benefit that it doesn't reduce the sampling to subsections of the string.
Ironically, Java used to only sample parts of the string as well, but found that
it produced too many collisions with certain string types, so they moved to use
this method.
RESULT : tst_QHash::qhash_qt4():
0.0537 msecs per iteration (total: 110, iterations: 2048)
PASS : tst_QHash::qhash_qt4()
RESULT : tst_QHash::qhash_faster():
0.015 msecs per iteration (total: 62, iterations: 4096)
PASS : tst_QHash::qhash_faster()
RESULT : tst_QHash::javaString():
0.016 msecs per iteration (total: 66, iterations: 4096)
Change-Id: Icb5da341ab6445163f4217650a0bdb3903e50210
Reviewed-by: hjk <qthjk@ovi.com>
Robin Burchell [Fri, 20 Jan 2012 08:08:41 +0000 (10:08 +0200)]
Change visibility of eventFilter().
Change-Id: I2d47e3d1f5a8fac5a1fe4638dce87a9e036f8544
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Bradley T. Hughes [Fri, 20 Jan 2012 10:34:50 +0000 (11:34 +0100)]
Add Contact: information in the license header
Contact point is the Qt Project, and needs to be included for
all new files added to the repository.
Change-Id: Id0e7219e1d11a169f1a91439728cbda55ab29eeb
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Bradley T. Hughes [Wed, 18 Jan 2012 15:15:44 +0000 (16:15 +0100)]
Silence warning from clang
QBasicAtomicPointer is forward declared as a class, keep the actual
declaration of QBasicAtomicInteger and QBasicAtomicPointer as class with
all public members (qoldbasicatomic.h does the same).
src/corelib/thread/qbasicatomic.h:158:1: warning:
'QBasicAtomicPointer' defined as a struct template here but
previously declared as a class template [-Wmismatched-tags]
struct QBasicAtomicPointer
^
src/corelib/global/qglobal.h:1861:23: note: did you mean struct here?
template <typename T> class QBasicAtomicPointer;
^~~~~
struct
Change-Id: I38c59c29d7f796dde772e7f403bbf98b04571a08
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Bradley T. Hughes [Wed, 18 Jan 2012 12:44:26 +0000 (13:44 +0100)]
Use Q_FOREVER instead of forever
Public headers should compile with QT_NO_KEYWORDS defined.
Change-Id: I5620b4b2600f5e39bb402b97d14fdb257dfe9942
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Thiago Macieira [Sun, 31 Jul 2011 20:40:40 +0000 (17:40 -0300)]
Add the new QBasicAtomicXXX implementation - no backends yet
The new implementation is API- and ABI-compatible with the old
implementation, provided that QBasicAtomicInt isn't used as an
argument in a function call or the return value: now, QBasicAtomicInt
is a typedef to QBasicAtomicInteger<int>.
The new design is based on CRTP: the QGenericAtomicOps template class
takes as a template parameter the derived class itself. This way, we
implement a "poor man's virtual" without a virtual table and
everything is inline.
QGenericAtomicOps implements most of the atomics code that is repeated
in many classes all over:
* Acquire semantics are obtained by placing an acquire barrier after
the Relaxed operation
* Release semantics are obtained by placing a release barrier before
the Relaxed operation
* Ordered semantics are obtained by placing an ordered barrier before
the Relaxed operation (either way would be fine)
* fetchAndStoreRelaxed and fetchAndAddRelaxed are implemented on top
of testAndSetRelaxed
* ref and deref are implemented on top of fetchAndAddRelaxed
It also adds load, loadAcquire, store and storeRelease: the default
implementations of loadAcquire and storeRelease operate on a volatile
variable and add barriers. There are no direct operators for accessing
the value.
Each architecture-specific implementation can override any of the
functions or the memory barrier functions. It must implement at least
the testAndSetRelaxed function.
In addition, by specialising one template class, the implementations
can allow QBasicAtomicInteger for additional types (of different
sizes). At the very least, int, unsigned and pointers must be supported.
Change-Id: I6da647e225bb330d3cfc16f84d0e7849dff85ec7
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Bradley T. Hughes [Wed, 18 Jan 2012 07:17:18 +0000 (08:17 +0100)]
Expect tst_QTreeView::editTriggers() failure on Mac OS X
EditKeyPressed 4 test data fails, all other test data for the function
pass.
Task-number: QTBUG-23696
Change-Id: Ied56bd0b653ad4dcc2b6451b486aae7cad134211
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Bradley T. Hughes [Wed, 18 Jan 2012 07:19:38 +0000 (08:19 +0100)]
Expect tst_QColumnView::moveCursor() failure on Mac OS X
Both test data fail.
Task-number: QTBUG-23697
Change-Id: Iee4b08a88db33c72c584e326e928863af61c8dd4
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Bradley T. Hughes [Tue, 17 Jan 2012 08:58:50 +0000 (09:58 +0100)]
Expect tooltip related test failures on Mac OS X
Mark test failures related to tool tips with QEXPECT_FAIL(). See
QTBUG-23707 for description of the failures.
Change-Id: I753256d1db748cef41cf1898620647c4cbacc472
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Bradley T. Hughes [Tue, 17 Jan 2012 13:23:15 +0000 (14:23 +0100)]
Ignore failures from tst_QWidget_window on Mac OS X
The tst_windowFilePathAndwindowTitle test currently fails, so mark the
failures as expected failures for now.
Task-number: QTBUG-23682
Change-Id: If64a82c919b218b5c1c38ce5228081bb46fe70ac
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Morten Johan Sorvig [Tue, 17 Jan 2012 19:02:18 +0000 (20:02 +0100)]
Compile.
Change-Id: I3c490eb2ce9bd655f4808b232663a530baec5990
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Kent Hansen [Thu, 19 Jan 2012 07:35:49 +0000 (08:35 +0100)]
Remove warning and automagic for "missing QT += quick"
This reverts commit
613183ff8c101fe544814259197d897b3540bc85
("Automatically add QtQuick module if only QtDeclarative is specified").
The QtQuick module has been around for a while now, and the need to
port to it has been duly announced.
After this commit, projects that use the QtQuick 2 API (QQuickItem
and friends) will explicitly have to add QT += quick.
Change-Id: Ie5e6d438431a0c736e214c28c0d1ba1189b4ee06
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Mark Brand [Wed, 18 Jan 2012 21:34:53 +0000 (22:34 +0100)]
fix case of included windows headers
Allows cross-building on unix.
Change-Id: If389138c2d3bf5e72c62c85d054785ac9232f158
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Mark Brand [Wed, 18 Jan 2012 21:36:32 +0000 (22:36 +0100)]
fix cross building mingw: doesn't need to pass qpa test
Change-Id: I4b40d122db81506bb2ad85db459f806ac93f8cbd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Xizhi Zhu [Thu, 19 Jan 2012 13:27:10 +0000 (14:27 +0100)]
Remove the useless connManager() function.
Change-Id: Ifac0796ec22d0656ccfcf31b8d45b2342c2ee646
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: hjk <qthjk@ovi.com>
Robin Burchell [Wed, 18 Jan 2012 11:43:47 +0000 (13:43 +0200)]
Remove Q_CC_MWERKS.
This is no longer supported.
Change-Id: I3914f5007595fd699fa1e9a565a0a3f59a0e135e
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Robin Burchell [Wed, 18 Jan 2012 15:21:04 +0000 (17:21 +0200)]
Remove Q_CC_NOKIAX86.
This is no longer supported.
Change-Id: Ic393bc48c4c842514da69b6696cfb62b54360070
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
Lars Knoll [Thu, 19 Jan 2012 09:29:41 +0000 (10:29 +0100)]
Remove QDir::convertSeparators()
This method has been deprecated since Qt 4.2.
QDir::toNativeSeparators() replaces it since then.
Change-Id: I49e6e1bfd50f26aa30134e599ee82067709549a7
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Jonas M. Gastal [Tue, 10 Jan 2012 11:36:56 +0000 (09:36 -0200)]
Removing QHttpHeader and QHttpResponseHeader.
QAuthenticator used it for the convinience of QHttpSocketEngine only.
QHttpSocketEngine has now been ported to use QHttpNetworkReply to parse
HTTP responses.
Change-Id: Idf6e70aa76613aad6e3d789d81ca1b4fd73575c2
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Lars Knoll [Wed, 18 Jan 2012 13:45:55 +0000 (14:45 +0100)]
Rename all our interfaces from com.trolltech to org.qt-project
Change-Id: I6db7211fcf6b24bd75e360645bbb2fdf1ef8a8bc
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Jan-Arve Saether [Thu, 19 Jan 2012 10:26:03 +0000 (11:26 +0100)]
Cleanup: No need to have two code paths that both return Unrelated.
QAccessibleInterface::relatedTo() does the job for us already.
Change-Id: I816022041e38c5f9dd742df1c4b9ca61b8d6a186
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Bradley T. Hughes [Tue, 17 Jan 2012 13:40:35 +0000 (14:40 +0100)]
Add "nswindow" resource to the Cocoa native interface implementation
This will return the NSWindow* for the given QWindow*. Port the QWidget
autotest helper to use the native interface and the "nswindow" resource.
Change-Id: I754b7e9288690ac3c99c3ec65c5526d5fe121234
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Bradley T. Hughes [Tue, 17 Jan 2012 13:37:38 +0000 (14:37 +0100)]
Remove the tst_QWidget::retainHIView() test
Qt is Cocoa only now, and does not use HIView anymore, making this test
is meaningless. The testAndRelease() and createAndRetain() helper
functions are also no longer needed.
Change-Id: I26180a4670c8e7445741d3aab510c4da7b65388c
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Bradley T. Hughes [Wed, 18 Jan 2012 10:04:02 +0000 (11:04 +0100)]
Prevent menubar related crashes
The native menubar interface does not communicate menubar destruction
down to the implementation, so we cannot keep naked pointers (otherwise
they become dangling). This happens often while running autotests as
windows, menus, widgets, etc. are quickly created, tested, and then
destroyed.
Work-around the crashes for now by using QWeakPointer. A proper fix will
need to be investigated to prevent the menubars hash from holding
dangling key pointers.
Change-Id: Ie8e50cbc52f9510e844fc3c0c5ae6a0865320282
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Joerg Bornemann [Wed, 18 Jan 2012 13:50:23 +0000 (14:50 +0100)]
remove NTFS junction and mount point detection
Qt now treats neither NTFS junctions nor mount points as symlinks.
Task-number: QTBUG-20431
Change-Id: I93f67d7438d441ceb53308d4a1f29335beedd547
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Joerg Bornemann [Wed, 18 Jan 2012 13:44:42 +0000 (14:44 +0100)]
Revert "fix NTFS mount points"
We agreed on treating neither junctions nor mount points as symlinks.
This will be handled in another commit.
This reverts commit
1656c4780cc6c1d96f47522046f3f53b1eebb95a.
Change-Id: I41a87b6df9f7fba333df4c967ee9f0c1f3940952
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Friedemann Kleint [Thu, 19 Jan 2012 07:33:55 +0000 (08:33 +0100)]
Fix compiler warnings in Qt Network.
- Missing return value
- Wrong format for qint64
Change-Id: Id0de58c85b7c8ed2a62f7237fd23e6c5a5ac92ec
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Bradley T. Hughes [Wed, 18 Jan 2012 07:10:35 +0000 (08:10 +0100)]
Disable 'make check' for tst_QWidget on Mac OS X
This test crashes, which can destabilize the CI system, so don't run the
test for now. It is still compiled as part of the build process, though.
Task-number: QTBUG-23695
Change-Id: I841fab7c56b8dba33e8d1b074f118b65790f34ef
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Bradley T. Hughes [Mon, 16 Jan 2012 11:02:48 +0000 (12:02 +0100)]
Replace Q_WS_MAC with Q_OS_MAC in tests/auto/other
Change-Id: If805ea762047d07872a278956fc7637e5bafc6db
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Friedemann Kleint [Wed, 18 Jan 2012 15:48:57 +0000 (16:48 +0100)]
Windows: Implement QPlatformScreen::name()
Change-Id: I04ec91b12936bdcc179b79558ac2285b70281dcd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Lars Knoll [Wed, 18 Jan 2012 08:51:03 +0000 (09:51 +0100)]
core as a directory name is usually not a good idea
Let's follow the other places in qtbase where the
directory is named corelib.
Change-Id: Ib426f4ee7311f622a89b252b9915aca1d3dd688d
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Friedemann Kleint [Wed, 18 Jan 2012 15:32:12 +0000 (16:32 +0100)]
Fix hang in tst_qwidgetaction on Windows.
Increase timer interval.
Change-Id: I2cf40415d356c29ebd753a0e78f43aee474123ca
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Jan-Arve Saether [Wed, 18 Jan 2012 13:42:13 +0000 (14:42 +0100)]
Remove all references to QAccessible::Self
navigate() to Self does not make any sense (its basically a clone).
It seems that its not that useful to return Self from relationTo(),
since it was only one place where relationTo() was called where it
checked for the Self flag. This was in the windows bridge, and we
could easily work around that.
If it really turns out that Self is useful, we can always add that
enum value back later.
Change-Id: I9ebb60da059a843de5e6fcab9e815b919afc6f2a
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Xizhi Zhu [Tue, 17 Jan 2012 16:56:47 +0000 (18:56 +0200)]
Remove QNetworkConfigurationPrivate::bearerTypeName().
Also, use QStringLiteral instead of QLatin1String.
Change-Id: I232fc02a56261929864c2ea66993ef1c74bc1237
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Xizhi Zhu [Tue, 17 Jan 2012 16:26:49 +0000 (18:26 +0200)]
Remove the useless undef for "interface".
"interface" is not used by QNetworkConfiguration.
Change-Id: I742fe179d415ab1424bfddb1f6c034fc98c55e61
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Xizhi Zhu [Tue, 17 Jan 2012 16:20:45 +0000 (18:20 +0200)]
Add the missing Q_DISABLE_COPY for public bearer classes.
QNetworkConfigurationManager and QNetworkSession are QObject, which
should not be thought of as values that can be copied or assigned, but
as unique identities.
Change-Id: I6ff0124a613862c2b411da2df31f03d5033315a9
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Kurt Korbatits [Wed, 18 Jan 2012 02:32:58 +0000 (12:32 +1000)]
Changed xml unittests to work from installation directory
- Changed to use QFINDTESTDATA and TESTDATA
Change-Id: Ib738adfb6d0553e4c995ccaa51e34335f00f50f0
Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Jan-Arve Saether [Wed, 18 Jan 2012 13:02:23 +0000 (14:02 +0100)]
Remove all references to QAccessible::(Covers|Covered)
These were not used in any bridges, and none of the bridges
(MSAA, Cocoa, AT-SPI/IA2) can hardly make use of this information.
Change-Id: If3cad6b6c1928535dd932f46c9ec6883a4a19c76
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Jan-Arve Saether [Wed, 18 Jan 2012 11:47:17 +0000 (12:47 +0100)]
Remove all references to Self in relation to navigate.
After this change, Self should only be used in the context of
relationTo().
Change-Id: I04bb2bf7c480f9350aceb6e53d78e5cf1808d53e
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Orgad Shaneh [Tue, 15 Nov 2011 08:34:38 +0000 (10:34 +0200)]
qmake: Normalize paths instead of converting to native separators
Task-number: QTBUG-22738
Change-Id: I40163a883d84beff79f52bff141d61dfe921c129
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Pekka Vuorela [Wed, 18 Jan 2012 11:35:26 +0000 (13:35 +0200)]
Remove QInputContext usage from QWidget test
Change-Id: Ifcd600f5efd5bd079dd2f8d66803e34ffa6df37f
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Pekka Vuorela [Tue, 17 Jan 2012 14:19:34 +0000 (16:19 +0200)]
QWidget editors to return correct value for Qt::ImEnabled
Qt::ImEnabled input method query was added for Qt5.
Enhancing source compatibility with Qt4 by setting query value
in QWidget if widget does not return any valid value.
Change-Id: I274c1f6c47a5cb08ecf550b25e5b358622e21d90
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Xizhi Zhu [Tue, 17 Jan 2012 13:57:55 +0000 (15:57 +0200)]
Remove QNetworkConfiguration::bearerName().
It was added only to maintain source compatibility with Qt Mobility.
Change-Id: Iea8d40e401bd1f8d5115268e09b256eacca69ea0
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>