Friedemann Kleint [Wed, 14 Mar 2012 11:17:11 +0000 (12:17 +0100)]
Fix compilation of the Windows accessibility code for MinGW.
Temporarily disable the code for MinGW.
Change-Id: I435305167e06af05b9a78901e6e3a35347c5c3f5
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Friedemann Kleint [Wed, 14 Mar 2012 13:51:19 +0000 (14:51 +0100)]
Add QGuiApplication::platformName.
Store the name of the QPA plugin as platformName.
Change-Id: Id87cab2a189743c0dd727c86080f7d4595a852bb
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Donald Carr [Mon, 12 Mar 2012 16:29:59 +0000 (16:29 +0000)]
Explicit use of null namespace breaks namespaced build
These changes are currently required to successfully build Qt when it is
configured with a namespace via the configure -qtnamespace argument
Change-Id: I9f3ab30579c16085c4d3d05705336b810466c331
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Sergio Martins [Sat, 10 Mar 2012 17:50:35 +0000 (17:50 +0000)]
Remove unused forward declaration.
Change-Id: Ib207e0036226dd7131195244bf49bbfae142cd22
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
Giuseppe D'Angelo [Wed, 29 Feb 2012 00:48:43 +0000 (00:48 +0000)]
bootstrap: remove QtXml dependency
Only qdoc is now using QtXml classes, so just add them to qdoc.pro
and drop them from the bootstrap library.
Change-Id: I821839396141d1d7a2ada565a513aa46c54c9620
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Friedemann Kleint [Wed, 14 Mar 2012 09:53:00 +0000 (10:53 +0100)]
QStyleSheetStyle: Fix icon properties.
Convert icon structure returned by the CSS parser.
Change-Id: I19b846c6cb0ec19045b6d07b3caa5ecfac75ca86
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Thorbjørn Lund Martsum [Sun, 11 Mar 2012 09:52:25 +0000 (10:52 +0100)]
QHeaderView - documentation update. Prefer hideSection over 0-resize.
There is a different behavior on 0 sections and hidden sections
e.g with scrollbars. Normally people want to use hideSection.
Change-Id: Id99de30ea46906bb4ef7720ed12d4ac9615c9743
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
kb [Fri, 9 Mar 2012 11:29:09 +0000 (12:29 +0100)]
Disconnect slots from the old sourcemodel in QIdentityProxyModel
When setting a new sourcemodel QIdentityProxyModel::setSourceModel
tries to disconnect from signals belonging to the NEW model instead of
from the existing sourceModel(). QIdentityProxyModel thus receives
signals from both the old model(s) and the new model. This results in
ASSERTS triggering in various slots, for example:
"Q_ASSERT(topLeft.isValid() ? topLeft.model() == model : true);"
in QIdentityProxyModelPrivate::_q_sourceDataChanged.
Change-Id: Ic6f65a9ee10981d00206335f2edef78272fadc1a
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Sergio Martins [Thu, 8 Mar 2012 20:41:12 +0000 (20:41 +0000)]
Use QRect::united(), QRect::unite() is deprecated.
Change-Id: Ia7aac74596c2f251c96fecf157d2aa4a935cf602
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Thorbjørn Lund Martsum [Sat, 3 Mar 2012 05:05:54 +0000 (06:05 +0100)]
QHeaderView - renaming functions in Qt5
This patch renames the functions in Qt5 according to the
notes. It also renames resizeMode to be consistent.
The old functions are both marked with both QT_DEPRECATED
and '### Qt 6 - remove'
All usage of the function within the qtbase are also
changed to use the new functions.
Change-Id: I9e05fa41d232e9ca43b945fcc949987017f3aedd
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Harald Fernengel [Tue, 13 Mar 2012 20:02:41 +0000 (21:02 +0100)]
Fix LSB build
Fix compliation in LSB by removing legacy calls and adding an explicit
header.
Change-Id: I13a73211c07457195b5d5aad0854643da1e25f9b
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Thorbjørn Lund Martsum [Sat, 10 Mar 2012 13:31:15 +0000 (14:31 +0100)]
Add two (forgotten) since 5.0
SHA for QWidget::hasHeightForWidth change:
466107107a85e7211c4b7f77b36ec50625657061
SHA for QAbstractItemDelegate::destoryeditor change
15f253a46aa45e2a9fa1055799fa2768ba49b9a3
Change-Id: Ic7e38c15f62eef22ab95414fad6e7b6c9c7d4f59
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Pierre Rossi [Wed, 7 Mar 2012 12:59:21 +0000 (13:59 +0100)]
Use the lazily-queried families for all QPA multi font engines.
This is the approach introduced together with the WebKit "backdoor"
that lets us use QRawFont with QTextLayout. We could use it all
over the place and share more code.
Change-Id: Ie1963679755f37ba9204d67554a163f1d1115604
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Giuseppe D'Angelo [Mon, 12 Mar 2012 18:41:34 +0000 (18:41 +0000)]
QRegExp: remove docs about RegExp2 being default in Qt5
Change-Id: I37f4086d53ce6f2d6774ab204808d0d678a68349
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
sh kim [Wed, 14 Mar 2012 06:38:10 +0000 (15:38 +0900)]
Fix build error when QT_NO_FILESYSTEMWATCHER is set
QPollingFileSystemWatcherEngine inherits from QFileSystemWatcherEngine.
This class should be covered by !QT_NO_FILESYSTEMWATCHER.
Change-Id: I053a873018cf3c9c443435c9b3f44240b0965c24
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
jian liang [Tue, 13 Mar 2012 14:52:51 +0000 (22:52 +0800)]
build fix for -no-freetype in Windows
Don't use QWindowsFontDatabaseFT::systemDefaultFont() and
QWindowsFontDatabaseFT::LOGFONT_to_QFont() in qwindowsfontdatabase.cpp and
qwindowstheme.cpp because it is not available when building with
-no-freetype.
Change-Id: I11075475ff435c55b0c641540f95a4d3861b79da
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Samuel Rødal [Tue, 13 Mar 2012 15:50:05 +0000 (16:50 +0100)]
Made sure first created xcb window still receives focus.
Change
50ca45f059524293790 caused mapped windows to not receive focus by
default. The _NET_WM_USER_TIME spec says that if the user time is set to
0 (or CurrentTime), the window will not be initially focused. Thus, if
the connection time has not yet been set, we skip this part to restore
the old behavior.
Change-Id: I19de3602c78629ad2bc65f5e1976313949c82c4c
Reviewed-by: Jan Arne Petersen <jpetersen@openismus.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Jędrzej Nowacki [Tue, 13 Mar 2012 13:15:53 +0000 (14:15 +0100)]
Unify QMetaType::TypeFlags detection.
Duplicated code was removed. As an side effect:
- one runtime flag check was replaced by a compile time check.
- is enum flag can be used together with built-in types.
Change-Id: I54173e7b07ce7e487d3cc21ba24dcccd28b5d049
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Giuseppe D'Angelo [Tue, 13 Mar 2012 04:25:00 +0000 (04:25 +0000)]
Add bin/qdoc to .gitignore
Changing .gitignore to match qdoc* instead of qdoc3*.
Change-Id: I94e41e6e4371c40e0dbc33639ca02523986149b0
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Johannes Zellner [Mon, 12 Mar 2012 16:52:27 +0000 (17:52 +0100)]
remove obsolete qudevhelper and adopt mouse and touch plugins
The QUDevHelper class is now replaced by QUDeviceHelper class.
All evdev input plugins are using the new udev helper now to enable
hotplugin for keyboard and mouse input.
EvdevTouch plugin still only uses the first detected device by udev,
this cannot be tested on my side, due to the lack of multiple touch input devices.
Change-Id: I01a4cfe1a80000bfb27c67a2f53faf560906b73c
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Jason McDonald [Tue, 13 Mar 2012 07:06:09 +0000 (17:06 +1000)]
Uncomment disabled code in QResourceEngine autotest.
Resource files are expected to be readable.
Change-Id: Ife2b624e69b58e2fb996bc3e210a6e6c5c6852fe
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Tue, 13 Mar 2012 05:12:54 +0000 (15:12 +1000)]
Tidy the QSettings autotest.
- remove unnecessary includes
- remove undefined private functions
- remove commented-out test function
- fix indentation
- clarify why part of tst_QSettings::setValue() is commented-out
Change-Id: I09e1a33896536e702f7ba65f266415536b4f9e0b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Tue, 13 Mar 2012 04:33:14 +0000 (14:33 +1000)]
Remove commented code from qtconcurrentmap autotest.
The removed code was already commented out when the test was added to
the Qt repository and does not compile when uncommented as it calls
non-existant overloads of QtConcurrent::FunctionWrapper1::operator().
Change-Id: I5a02efae4b89e2815b077474aa7cd0192dcb2730
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Kim Motoyoshi Kalland [Tue, 13 Mar 2012 14:25:36 +0000 (15:25 +0100)]
Removed invalid assert in BMP loader code.
Task-number: QTBUG-24505
Change-Id: I2e369b6d92f072caadeda41125303856ddfabd48
Reviewed-by: aavit <qt_aavit@ovi.com>
Rick Stockton [Fri, 17 Feb 2012 06:23:27 +0000 (22:23 -0800)]
Fix a Typo in evdevkeyboard.pro
bad was: /qevdevkeybaord_defaultmap.h
good is: /qevdevkeyboard_defaultmap.h
Change-Id: Ic29bf94df0012e7ed3f05c0f258198d1b561d99a
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com>
Miikka Heikkinen [Mon, 12 Mar 2012 11:36:25 +0000 (13:36 +0200)]
Windows: Fix QSpinBox background setting via stylesheet
When using stylesheets, palette mask for drawing the background
of line edit child of spinbox is already correctly resolved to style
options in QStyleSheetStyle::drawPrimitive(), so we cannot simply
ignore that mask and check the palette mask of the parent spinbox.
Fixed by using a union mask of the parent spinbox palette and the
palette supplied by style option instead of simply using the mask from
parent spinbox. If either specifies custom base color, use that to
paint the background of the spinbox's line edit.
Task-number: QTBUG-24323
Change-Id: I1e738192db83b16d9bd48da54d29779e18788ef7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Mark Brand [Mon, 12 Mar 2012 20:16:40 +0000 (21:16 +0100)]
improve declaration scope
Change-Id: Id8d8f4e59793ba5fc2d3afa31674009af73a59c9
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Mark Brand [Tue, 13 Mar 2012 09:32:58 +0000 (10:32 +0100)]
use QStringLiteral
Change-Id: I0f2b6ff758524e872d38dcbdc9335264431e3dc6
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Honglei Zhang [Mon, 12 Mar 2012 14:52:25 +0000 (16:52 +0200)]
Fix memory leak when sqlite3_open_v2 fails
According to SQLite documentation, a database connection handle
is usually returned, even if an error occurs. This behavior has
caused Qt to leak memory when opening a database is failed. Now,
even if sqlite3_open_v2() does not return SQLITE_OK, Qt tries to
release SQLite database handle by calling sqlite3_close().
Task-number: QTBUG-15773
Change-Id: I6538e2897216828a9cfb95b7d4a5cec437aa6c28
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Laszlo Agocs [Mon, 12 Mar 2012 08:48:08 +0000 (10:48 +0200)]
Deliver events in qtestmouse
Not waiting until the QPA event queue is processed after
handleMouseEvent() is wrong. Unlike the synchronous sendEvent() calls
these tests most likely utilized earlier, many of the
QWindowSystemInterace functions are asynchronous in the sense that they
just queue the event, delivery will happen when the event dispatcher on
the main thread gets there.
Change-Id: I8197d2dc4805cda684a8279ceb8d4b317f19aba7
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Jan-Arve Saether [Thu, 6 Oct 2011 07:41:34 +0000 (09:41 +0200)]
Add support for IAccessible2 on Windows
Change-Id: Ia955ab46dc5037ed1c74e0acc525e98b02552c97
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Friedemann Kleint [Tue, 13 Mar 2012 13:29:48 +0000 (14:29 +0100)]
uic: Avoid creating multiline QStringLiterals for MSVC.
The compiler complains about L"foo" "bar".
Change-Id: I94be0528b26fe65413db56d210a5c02fcdba13a3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Frederik Gladhorn [Tue, 13 Mar 2012 13:11:51 +0000 (14:11 +0100)]
Print all accessibility event strings.
Change-Id: I2488fe86fb2c154a8b7d91c6e4f2cd9c9e7b9ecb
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Eskil Abrahamsen Blomfeldt [Tue, 13 Mar 2012 12:18:14 +0000 (13:18 +0100)]
Optimize HB memory consumption of PairPos1 in GPOS tables
This is pretty much the same fix as in
be0dfa34737a014e7ad060a90c4c24be9998fe13 but for PairPos
format 1 instead of 2.
With very simple GPOS tables we would waste a lot of memory on
caching an uncompressed table, so we now compress it in memory
as well.
Change-Id: I601331b4b83f636dab9e1ac403b343558c15b0de
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Martin Smith [Tue, 13 Mar 2012 13:46:28 +0000 (14:46 +0100)]
qdoc3: qdoc now handles overloaded methods for QML
When a C++ class is documented as a QML type, it can
have overloaded QML methods. These are now handled
correctly by qdoc. The method list for QML types is
now output with the full method signature. For signals
and handlers too.
Task-number: QTBUG-24670
Change-Id: If529d4136f5b480373b6ac25d2dceef15e6ea3db
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Casper van Donderen [Tue, 13 Mar 2012 15:51:53 +0000 (16:51 +0100)]
Update the footer for qdoc output for qt-project.
Change-Id: I418ac4e754aac96220d14948ce066c982c4b8054
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Bradley T. Hughes [Tue, 14 Feb 2012 09:01:17 +0000 (10:01 +0100)]
Remove -arch argument and #define QT_ARCH from configures
Do not try to detect the host or target architectures using uname or
similar, and do not override with the -arch or -host-arch configure
arguments. The configures will still accept the -arch and -host-arch
arguments, but it ignores them and instead outputs a warning stating
that these arguments are obsolete and should not be used.
Set QT_ARCH and QT_HOST_ARCH qconfig.pri variables based on the compiler
target. This is done by running qmake (twice when cross-compiling) on
config.tests/arch/arch.pro, which preprocesses a file that contains all
knowns processors.
On Windows, configure.exe has never run any config.tests before, and
does not currently have a function to run a program and capture its
output. Use _popen() to accomplish this (as qmake does for its system()
function). This needs to be done after qmake is built, as does the
mkspecs/qconfig.pri generation. As a side effect, the configure steps
have been slightly re-ordered, but the overall result is the same. The
displayConfig() call is moved to just before generating Makefiles, so
that it can show the detected architecture(s).
Change-Id: I77666c77a93b48848f87648d08e79a42f721683f
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Frederik Gladhorn [Wed, 7 Mar 2012 18:38:39 +0000 (19:38 +0100)]
Clean up test, check radio button and checkbox.
Change-Id: I4dcfa2014256aee10feb08146ae6fc3f402ac8fb
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Frederik Gladhorn [Wed, 7 Mar 2012 18:09:33 +0000 (19:09 +0100)]
Autotest details of QAccessibleEvent.
Change-Id: Ieec33c23e7b18cfedf061088d6561203a5e7ac39
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Martin Petersson [Thu, 1 Mar 2012 09:36:38 +0000 (10:36 +0100)]
QNam: only init channels when needed.
Each channel will create a socket that will allocate memory for the
read and write buffers. This change will instead initialize
channels only when they are needed.
Change-Id: I112b4c7b944a7dd345414f06260c92803394eaed
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Friedemann Kleint [Tue, 13 Mar 2012 07:57:15 +0000 (08:57 +0100)]
Fix icon suffixes in systray example.
Change-Id: If464befa88f26a881557724b4fc175f0a82c90b6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Mark Brand [Mon, 12 Mar 2012 20:14:37 +0000 (21:14 +0100)]
take opportunity to use const
Change-Id: Ief12d4b55e1705c758dae8078cf52948fcd9565b
Reviewed-by: Richard J. Moore <rich@kde.org>
Casper van Donderen [Mon, 12 Mar 2012 21:40:31 +0000 (22:40 +0100)]
qdoc: Update to prepare to run on a directory.
This change sets some default file extensions to accept to generate
documentation. It also removes support for the sourceModules qdocconf
variable which is not used anymore. It was used just after
modularization.
Change-Id: Iabdcfb534dc662bd44e0928036fd68ee4e460b07
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Rick Stockton [Thu, 8 Mar 2012 22:33:15 +0000 (14:33 -0800)]
Cocoa platform plugin: Add support for up to 16 mouse buttons
OS-X provides a buttonNumber within Event data for otherMouseDown:
and otherMouseUp: Events. Instead of mapping all occurences of these
event types to Qt::MiddleButton, this Update uses that data
to support a total of 16 mouse buttons.
Task-number: QTBUG-24702
Change-Id: I3cffb32498f98ea182509d7c42f3fc6634155ebb
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Charles Yin [Tue, 13 Mar 2012 03:12:09 +0000 (13:12 +1000)]
Move variant animation interpolators from QtWidgets to QtGui
There is no reason these interpolators need to stay in QtWidgets library.
Change-Id: I27db49fea2cfd8f0ef417dc52edf66dd1835e7a1
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Balazs Kelemen [Thu, 8 Mar 2012 16:02:15 +0000 (17:02 +0100)]
Fix QFont hinting preference with fontconfig
Consider if the hinting preference of the QFont
is not PreferDefaultHinting.
Change-Id: I0f50b320356787b6c1eabee5f009e7d326a06925
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Andy Shaw [Tue, 6 Mar 2012 09:39:34 +0000 (10:39 +0100)]
Cleanup after the qsf cache file if it fails to be written to
It is possible that although a qsf cache file could be opened that it
could not be written to, therefore it should clean up after itself in
these cases so that it does not cause a problem later on.
Task-number: QTBUG-24122
Change-Id: I1999759837607657ddc3f967eeda370ce9991a16
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Mark Brand [Tue, 28 Feb 2012 21:42:02 +0000 (22:42 +0100)]
QSqlTableModel::isDirty(): new overloaded method
Checks if model has any changes to submit.
Includes new test covering isDirty(index) as well the new
overloaded function.
Task-number: QTBUG-3108
Change-Id: I0ccbda45d5d9f06434cf1e1c037a9efb76d0cc37
Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com>
Alexei Rousskikh [Mon, 12 Mar 2012 18:33:39 +0000 (14:33 -0400)]
Trailing comma should result in an error during JSON parsing
1. QJsonParseError::MissingObject defined
2. QJsonDocument::fromJson() will result in defined error after parsing
of something like "{ 'key':1 , }" or "[ {'key':1}, ]"
Change-Id: I8e6234a03b8aca4e5ad6180f273f91066b86d7a1
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Donald Carr [Tue, 6 Mar 2012 22:12:18 +0000 (22:12 +0000)]
Clean up src.pro
Removing (some) stale assumptions about dependencies from src.pro file
Change-Id: I713e3ad8c164321ef035e6c62b25e18e45d1d3ef
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Tasuku Suzuki [Wed, 29 Feb 2012 04:32:20 +0000 (13:32 +0900)]
Input method on Mac
Restore input method implimentation in Qt4
Task-number: QTBUG-23867
Change-Id: I5d405ccc8b0a73c399d992f6474a0cc38d191157
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Girish Ramakrishnan [Fri, 9 Mar 2012 22:39:14 +0000 (14:39 -0800)]
Check for PKG_CONFIG_LIBDIR when cross compiling.
When cross-compiling, check for PKG_CONFIG_LIBDIR instead of
PKG_CONFIG_PATH. pkg-config searches for pc files in PKG_CONFIG_PATH
*and* the compiled in defaults (/usr/lib/pkgconfig). This means that
pc files from the host get found when cross-compiling.
Setting PKG_CONFIG_LIBDIR makes pkg-config search only in the path
set in PKG_CONFIG_LIBDIR.
Documented in the url below:
http://www.freedesktop.org/wiki/Software/pkg-config/CrossCompileProposal
Change-Id: I22dbf29c5691572b7cb8a5fce712ae7ba811670e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Debao Zhang [Sat, 10 Mar 2012 02:28:12 +0000 (18:28 -0800)]
Move tst_qshortcut.cpp to QtWidgets
QShortcut belongs to QtWidgets instead of QtGui.
Change-Id: I9715399bb372a6ea4bd76109f87ba31a1e30a7e6
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Shane Kearns [Tue, 21 Jun 2011 13:50:08 +0000 (14:50 +0100)]
Workaround webkit deadlock on macos x
The webkit AtomicallyInitializedStatic and Qt's Q_GLOBAL_STATIC can
deadlock on the Mac, as the mac compiler inserts calls to
__cxa_guard_acquire and __cxa_guard_release around initialisation of
local statics.
In Q_GLOBAL_STATIC case, this is the QGlobalStaticDeleter local static
Whereas webkit AtomicallyInitializedStatic is a local static variable
in any case.
Problem is triggered because webkit constructs QNetworkConfigurationManager
inside the constructor of a local static - networkStateNotifier
And the generic bearer plugin calls QNetworkInterface::allInterfaces
in the bearer thread, which needs an initialised Q_GLOBAL_STATIC.
Reviewed-by: Laszlo Agocs
(cherry picked from commit
38db40d9a2db44e47b0aabd9487284cd1106b353)
Task-number: QTBUG-24554
Change-Id: Id2c7818faefb46e66b0bbc30ce30595d46d53016
Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
Jørgen Lind [Mon, 12 Mar 2012 11:04:54 +0000 (12:04 +0100)]
Remove redundant wayland stuff from QtBase
Config checks are done in the module.
We pick up the pkg-config stuff also in the module. There shouldn't be a
need to do this in configure anyway
Change-Id: I9ef73760511c6b684c6cd5dd13e7e581c588e7aa
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Friedemann Kleint [Fri, 9 Mar 2012 08:40:57 +0000 (09:40 +0100)]
Re-add the Systray example.
Remove its dependency on QtSvg by converting the icons to
(optimized) png files.
Change-Id: If63257938dc816d7ab76a3042b9ac88ef3d51b07
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Friedemann Kleint [Mon, 12 Mar 2012 16:16:35 +0000 (17:16 +0100)]
Windows: Implement QWindowsIntegration::queryKeyboardModifiers()
Use code from Qt 4.8.
Change-Id: I32d220e04d13ee1e692c0c58268b827bcf519dc7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Friedemann Kleint [Fri, 9 Mar 2012 08:53:10 +0000 (09:53 +0100)]
Implement QSystemTrayIcon for Windows.
No longer base the implementation on a QWidget which is not
necessary when all that is required is a message window listening
to task-tray messages. Export a service function creating a message
window from the Windows native interface and use that.
Task-number: QTBUG-20978
Change-Id: I01d0faeac777df4eee802c51d2bc722fce814080
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Jørgen Lind [Mon, 12 Mar 2012 11:16:13 +0000 (12:16 +0100)]
Don't define QT_NO_CORESERVICES on all platforms. That's just annoying
Change-Id: Id814bd0956b97c84ff0e6fcae8e5f22394c433e7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Jørgen Lind [Mon, 12 Mar 2012 11:48:20 +0000 (12:48 +0100)]
Fix the QMAKE_LIBS_WAYLAND variable
This variable is there for documentation, but its not being used anymore.
There are two libraries from wayland, libwayland-client and
libwayland-server. Add two variables that will be picked up in the
QtWayland module.
Change-Id: I16219092a4ed2e48080921ce39f61192b6abb711
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Debao Zhang [Fri, 9 Mar 2012 00:48:17 +0000 (16:48 -0800)]
Move the auto test of QPixmap::grabWidget() from QPixmap to QWidget
Change-Id: Id565fa1eb8fe13c62a93a5afa39a5701ce7b20ea
QPixmap::grabWidget is deprecated, which calls QWidget::grab() at present.
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Giuseppe D'Angelo [Mon, 23 Jan 2012 23:09:51 +0000 (23:09 +0000)]
QRegularExpression: add error strings for translation
Added the error strings from PCRE to be picked up by lupdate,
to enable translations.
Change-Id: Iaeabde5d7a17f9a0273511e0741e67a097d23a98
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Sean Harmer [Mon, 12 Mar 2012 11:03:47 +0000 (11:03 +0000)]
Do not add -rpath-link directives with no library path
Doing so works fine on Linux as g++ version there silently ignores
this. However, the qcc toolchain for QNX barfs.
Change-Id: Ia236910adc09dc1653e4169e20476b69c2de62ab
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Marc Mutz [Tue, 6 Mar 2012 11:14:51 +0000 (12:14 +0100)]
tst_exceptionsafety_objects: add virtual ~AbstractTester
GCC complained about undefined behaviour when
deleting subclasses of AbstractTester through
pointers to AbstractTester, and it's doing so
correctly...
Change-Id: Ie641281d8aafe32c5c9784e8aa39672ff0b699c7
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Frederik Gladhorn [Wed, 7 Mar 2012 15:27:47 +0000 (16:27 +0100)]
Add documenation about QAccessibleStateChange event.
Change-Id: Iea34d71d71a6dd58f761722ce20ae8ec2b81ae58
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Frederik Gladhorn [Wed, 7 Mar 2012 15:21:38 +0000 (16:21 +0100)]
Use QAccessibleEvent in test.
Change-Id: I4f9c0f503543caa5704a29c8ccd7c4134b455625
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Donald Carr [Fri, 9 Mar 2012 00:59:37 +0000 (00:59 +0000)]
Remove stale references to Qtopia
Change-Id: Idd9b5fae8f6a0273636a878325e82e5664a40d43
Reviewed-by: Donald Carr <donald.carr@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
jian liang [Thu, 1 Mar 2012 16:07:49 +0000 (00:07 +0800)]
Delete QPlatformDragPrivate object in QPlatformDrag's destructor
Change-Id: Ib722df14123b24ca044f6e0846aa1435c7e0e201
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Mark Brand [Wed, 7 Mar 2012 23:19:03 +0000 (00:19 +0100)]
QSqlTableModel::indexInQuery: fix inserted row accounting
Commit
b979956ec46093e5668c2b264f9b68da3cbb0326 introduced a
distinction between rows that have a pending INSERT operation and
rows that have already been inserted in the database but still are
in the change cache. Both cases are rows that are not in the underlying
query. Unfortunately, we overlooked a case where the point of the test
is whether the row is in the query.
Change-Id: I0f58bed232d9336fed6e67c3d140fd580ec35868
Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com>
John Tapsell [Thu, 8 Mar 2012 23:10:30 +0000 (23:10 +0000)]
Harfbuzz GPOS hinting- do not consider a subtable to be invalid if it is just empty
Considering a subtable to be invalid when it was empty meant that it
returned an error causing all further hinting to be aborted. This means
that we get no hinting in certain cases with certain fonts.
Change-Id: I840c016dc85935b4f2c4373c66a79b4bd8b3a30d
Reviewed-by: Adrian Yanes <ext-adrian.yanes@nokia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Stefan Hundhammer [Thu, 1 Mar 2012 16:14:38 +0000 (17:14 +0100)]
Line up underlines if fallback fonts are used (QTBUG-21832)
Change-Id: Icecc514f6c47c0576af8cabd39cdc0987f8d93fa
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Jason McDonald [Fri, 9 Mar 2012 04:11:26 +0000 (14:11 +1000)]
Fix indentation of QWaitCondition autotest.
No functional changes - cosmetic change only.
Change-Id: I7332eaab31720776c70a7ef813d55db44bab83f7
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Fri, 9 Mar 2012 03:56:03 +0000 (13:56 +1000)]
Remove MSVC 6 workaround from QtConcurrent.
MSVC 6 is not supported by Qt 5.
Change-Id: I2aef026eb2ad6a68cd9bcddcf6578cb1a019b21c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Fri, 9 Mar 2012 03:50:19 +0000 (13:50 +1000)]
Remove gcc 3.x-specific code from QtConcurrent and its tests.
Change-Id: I4dd0ce50b70a47a0a00f4c7ec18077a1bcbe5705
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Andrew den Exter [Fri, 9 Mar 2012 02:25:31 +0000 (12:25 +1000)]
Add a movable type declaration to QGlyphRun.
Allow it to take advantage of QList optimisations for pointer types.
Change-Id: Iddbb9741efef43604e38fc3eeb08b522c0414e21
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Sergio Ahumada [Mon, 12 Mar 2012 11:06:39 +0000 (12:06 +0100)]
qdoc: Fix closing 'table class="generic"' tag
Change-Id: I251ed6d4e5788b0816211e06f33ace03d2fa14e8
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Debao Zhang [Sun, 11 Mar 2012 00:17:27 +0000 (16:17 -0800)]
Convert xlib plugin to new format
Change-Id: I00418a1eb7bf944ec360dbbb1f61f7703f3ecd37
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Morten Johan Sorvig [Tue, 21 Feb 2012 12:02:24 +0000 (13:02 +0100)]
Remove Mac multiple-arch support.
Change-Id: Iaad361301e4772c3d8be6186da88e494cb234801
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Morten Johan Sorvig [Mon, 23 Jan 2012 13:55:48 +0000 (14:55 +0100)]
Cocoa: Fix accessiiblityPerformAction
Remove hardcoded pressAction();
Change-Id: Ie02e3f2f88a2cd311aec1b39daa160efb3b2b617
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Sean Harmer [Fri, 9 Mar 2012 17:21:22 +0000 (17:21 +0000)]
Rename blackberry QPA plugin to QNX
Changing the naming scheme from Blackberry to QNX in line with pattern
of using platform names.
Change-Id: I048a6a18010bc932311d63c8dde19ccab97894c8
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Frederik Gladhorn [Wed, 7 Mar 2012 19:48:06 +0000 (20:48 +0100)]
Remove QAccessible2::TableModelChange.
This was never a good idea since it has issues:
It doesn't really work with more than one update without
the client fetching the data. The same is unlikely to work reliable
since it involves two ipc roundtrips.
Instead we should have an extended QAccessibleEvent that contains
the data so that the bridges can decide how to pass on the data if
needed.
Change-Id: Iaf6b74f49586f7155909a6fe1a17137b71b31175
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Debao Zhang [Sat, 10 Mar 2012 02:43:21 +0000 (18:43 -0800)]
Move tst_qprinter.cpp to QtPrintSupport
QPrinter and QPrinterInfo belong to QtPrintSupport.
Change-Id: I0c146e0c717be365e752c1eaf7dbe6765fb72da2
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Debao Zhang [Sat, 10 Mar 2012 02:09:17 +0000 (18:09 -0800)]
Clean up some auto tests of gui
These unit tests do not depent on QtWidget.
Change-Id: I95526125c563885c0531da7ebfee06bca9a87b1c
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Frederik Gladhorn [Wed, 7 Mar 2012 12:51:31 +0000 (13:51 +0100)]
Update accessibility StateChange by custom event.
Subclass QAccessibleEvent to give details what changed in the
state change.
Change-Id: I9005d311e85a3c8bfa6e062833fa6a8a7dc6a4a4
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Casper van Donderen [Mon, 12 Mar 2012 09:48:44 +0000 (10:48 +0100)]
Remove unnecessary function.
The reconstituteFieldMemberExpression static function was not usedf
anywhere.
Change-Id: Ide23045d7f7c3194a9725ae658df85562ba29ad5
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Laszlo Agocs [Fri, 9 Mar 2012 12:26:43 +0000 (14:26 +0200)]
Migrate QWindowSystemInterface to use QElapsedTimer
Change-Id: I7dfb0590dce79678d49f5d6ef8f60758719bcf72
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Oswald Buddenhagen [Sat, 10 Mar 2012 09:04:04 +0000 (10:04 +0100)]
sanitize install target names
qmake uses the variable name verbatim, which makes the generated
makefile look "interesting" without this cleanup.
Change-Id: If6c4f12563a0ee6429513fbfac534f40bb7c0b97
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Sean Harmer [Tue, 6 Mar 2012 18:05:27 +0000 (18:05 +0000)]
Allow qmake to find features when using mkspecs in nested dirs
Commit
8e5eb1bddcfc introduced the assumtion that mkspecs are
immediately below the mkspecs directory itself. This is not true for
e.g. unsupported/blackberry-armv7le-qcc.
This commit restores qmake's ability to find the "root" of the mkspecs
collection no matter how deeply the actual mkspecs are nested.
Task-number: QTBUG-24665
Change-Id: I98faaf8e6ae7b8524277aea6c17e685e507e37b3
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Oswald Buddenhagen [Fri, 9 Mar 2012 18:11:27 +0000 (19:11 +0100)]
QT_RAW_INSTALL_FOO => QT_INSTALL_FOO/raw
this makes the "sysrootable" properties more magic, with the raw
versions being omitted from the qmake -query output and automatically
falling back to the "cooked" variant if there is no sysroot set.
this makes the "normal" qmake -query less noisy. this will become even
more obvious when i add more "overloads" of the properties.
Change-Id: I08000986427264ec6238c8fe0a77f5cecdbf1201
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Oswald Buddenhagen [Fri, 2 Mar 2012 18:30:00 +0000 (19:30 +0100)]
rip out -incremental from configure
the feature is rather obscure and unlikely to be used by anyone.
Change-Id: I2dfb4ca4d5d1f210d385c013f46bc6389fd6ea2d
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Sean Harmer [Sun, 11 Mar 2012 12:14:43 +0000 (12:14 +0000)]
Update qnx mkspecs to not use fixed tool paths
This changeset allows Qt to be built for QNX platforms in light of
commit
d59e85d9095f5d8fa787149fe8d34e8dfac0a0b5.
Change-Id: Idf8e89cf1b0a5625ef7ee6397c223137fa151cdc
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Lars Knoll [Sat, 10 Mar 2012 22:51:31 +0000 (23:51 +0100)]
Restore some source compatibility
Add an implicit #include back in to avoid
needless SC and compilation breaks.
Add some deprecated method for codecForTr, until
all other modules are ported to mot use it anymore.
Change-Id: I5334b47a0c32819b9eb6b7203cc98ce4e6073a64
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Debao Zhang [Fri, 9 Mar 2012 00:05:03 +0000 (16:05 -0800)]
Move tst_qicon.cpp and tst_qpixmapfilter.cpp to QtWidgets
QIcon and QPixmapFilter belong to QtWidgets instead of QtGui.
Change-Id: I6d82811e04046edb0cc67c55970c161612e86d3f
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Vincent A [Wed, 7 Mar 2012 18:24:29 +0000 (19:24 +0100)]
Support Growl >=1.3 in QSystemTrayIcon
The app name has changed in Growl 1.3, but the id
stays the same. Also don't send notifications if
Growl is not running to follow recommendations.
Change-Id: I31ff7df272b4af1b4f1e4db80c47e7ba75038dec
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Jason McDonald [Thu, 8 Mar 2012 05:52:03 +0000 (15:52 +1000)]
Remove outdated assumption from QVariant autotest.
The test was assuming that "data()" is a special function in autotests,
but that hasn't been the case since early prototypes of testlib.
Change-Id: Ic24cf5dc539b55d12eba0a6ab17173e2ed698f21
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Thu, 8 Mar 2012 06:20:31 +0000 (16:20 +1000)]
Fix compile warnings in QCoreApplication autotest.
- Use const_cast to avoid "deprecated conversion from string constant to
'char*'" warning when building argv arrays from string literals.
- Use Q_UNUSED to avoid warnings on unused local variables.
Change-Id: Idd2c8279adc102b6ebc6af7486ba26fe9ed4e7c1
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Robin Burchell [Mon, 5 Mar 2012 14:05:16 +0000 (15:05 +0100)]
Force properties to be applied in the order in which they are specified.
Previously, property setting was randomized in order, which means that things
like: qproperty-foo: 4; qproperty-bar: 5; where foo may affect bar worked by
chance - or not at all - depending on the hash function.
Change-Id: Ifb9813ee72842cefb278cbedb644f24b91113f3f
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Jason McDonald [Thu, 8 Mar 2012 05:48:23 +0000 (15:48 +1000)]
Remove redundant and incorrect comment from QList autotest.
Change-Id: I3187d0d8ace120181a4c49bbc68f421ddf5acbe0
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Thu, 8 Mar 2012 01:30:10 +0000 (11:30 +1000)]
testlib: Improve formatting of QCOMPARE failure messages.
Make the various versions of the failure message align consistently so
that it's a little easier to compare the actual and expected values. Of
course, the value won't align nicely unless the "actual" and "expected"
strings are the same length, but at least this commit makes that
consistent across all versions of the message.
Change-Id: If9ce231df3b5d279a06f6458fdb5da0aa4586068
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Glenn Watson [Tue, 7 Feb 2012 02:25:07 +0000 (12:25 +1000)]
Add Q_IS_ENUM(), and provide as flag in QMetaType::typeFlags()
Add Q_IS_ENUM() macro to determine if a given type is an
enumeration. Use information from that in QMetaType::registerType()
to store whether custom registered metatypes are enums or not.
This information can then be accessed by calling
QMetaType::typeFlags(int type). This is used by the declarative
code to determine whether a custom type in a variant can be safely
cast to an integer, which is required to allow passing non-local
enums as signal/slot params.
Change-Id: I9733837f56af201fa3017b4a22b761437a3c0de4
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>