| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When defining QT_NO_WARNING_OUTPUT then qWarning() is not available so
it should be defined in the same manner as qDebug() in this context
which is as QNoDebug.
The cases in QtNetwork are changed to use qWarning("....") to avoid
having to add in an extra include of QDebug just so that qWarning() is
declared in the QT_NO_WARNING_OUTPUT case.
Task-number: QTBUG-25308
Change-Id: I4960d8943e805697d4c05cc6988306e5c25fc2bb
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The used functionality is partially not available under WinCE.
qnetworkfunctions_wince.h encapsulates the needed extra symbols.
It only needs to compile as the functions are loaded dynamically.
Change-Id: Ieb9010d4f6c7f94d39918b869ac503976e094e49
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from commit 0e317af13f24d88a88c41f5efbd3fe9180ec6bee)
Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
lang/gcc40 was removed from FreeBSD's ports tree in 2007, and the
lang/gcc port, which provides a stable GCC version newer than the one in
the base system, is currently pointing to the 4.6 series.
Cherry-picked from c7b52e2a2a46047b7b6bca74a39c81cf43f1c864 to
qt5/qtbase.
Change-Id: I085e8495d449f47c1cfcf74e7f6511b2a8e3caa1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Move to fromFile to load Qt resources for two reasons. The
first is that ::fromData creates a QBuffer on our raw data
and is passing that to the QImageReaders. Right now we there
is a QFile -> QByteArray -> QBuffer transition that wastes
cycles. The other reason is that QPlatformPixmap::fromData
did/does not check if the decoded image is null and might
cause a crash because of that.
Change-Id: I800bfe4cd9b5d6a0d3531ed33f4228770703e94f
Original-Id: I7cb92d84874323e7205ab28883cc0fe9ecca1e27
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
|
|
|
|
|
|
|
|
| |
Change-Id: Iecae324b1ae00c0d6fb6ed36a8f4a27f51a31d07
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Simo Fält <simo.falt@nokia.com>
Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Absent the exports changed by b84e033f2e77d108da413c00ee3d9f1636e8ad5b
to enable symbian building.
Change-Id: Ie3d715eea5ec2e955633ecfe019cb7fcaed9377d
Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
|
|
|
| |
Absent the exports deprecated by ed881474111d635bb90d3e08e9fb70c06d19d48b
to enable symbian building.
Change-Id: I775d0159743d7d61866d910eefa9a0f807c7feff
Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
|
|
|
|
| |
When creating the temporary project object,
Option::output_dir must be adjusted temporarily.
Task-number: QTBUG-22788
Change-Id: Ibf8897a46b63f48b9e33d7e2168b09e559cecec7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit ac7dd2782f078e66c5240a07fff5a25cdf5ba61b)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Since Windows Vista the resource language must be included to
make the version information visible in Windows Explorer.
Two new variables have been introduced:
RC_LANG (default: 1033) - resource language
RC_CODEPAGE (default: 1200) - resource codepage
Task-number: QTBUG-23218
Change-Id: I29e102d19501e3b7a43d5096fc4806bc38a4d846
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit 8987e5d2cb7b7816fd0002fd9ad939ab4f08971b)
|
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-23513
Change-Id: I5dd6fb6fd7910e43acd28057133a3ad6613cfc1a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit 31cfe5ca1b5006566051942254d977581a769e3e)
|
|
|
|
|
|
|
|
|
|
| |
For variables that are supposed to contain a single int,
this method returns the numeric value.
Only the first value of the variable is taken into account.
Change-Id: Ifa11ba5ac044e0a4703a387a9bcf02043e4681d8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit ee4d723ecc24e6be33b4c30f9693b7fdce79c767)
|
|
|
|
|
|
| |
Change-Id: Iaf8bb1772846001297e1a421c3860f5e4d090a35
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 65425be8fef69733fb1613e1487f3f6b4fb2d472)
|
|
|
|
|
|
|
|
|
|
|
| |
Make freebsd-g++40 include gcc-base-unix.conf and g++-unix.conf and
eliminate a lot of duplicate definitions.
Cherry picked from 996672933a61016fdc0ec6d42d536986c5080ac5 to
qt5/qtbase.
Change-Id: Iae42f48b4f43e92567b30f340a25f0bd86c43463
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
According to FreeBSD svn r52802 from 1999 the -aout compiler option and
the QT_AOUT_UNDERSCORE trick were already obsolete.
Since the FreeBSD project itself only supports versions 7 and above
these days, the definition can be safely removed.
Cherry-picked from 874ebef4535e5ae43d917595f00edd365150cfd9 to
qt5/qtbase.
Change-Id: I93717e7c937f05b36580914608a3d2d1177ef7d6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
GCC 3.4 is older than the 4.2.1 in the base system, and should be
removed from the ports tree.
Besides, nobody in their sane mind would want to build Qt with such an
old compiler.
Cherry-picked from 0e8aabadf947926b78de140fabf8be789c96a9ac to
qt5/qtbase.
Change-Id: Ie739d839f1b621aeda693ae6f6a78909a557f3dd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QT_SOCKLEN_T was being redefined depending on whether FreeBSD was < or
>= 4, branched in early 1999.
FreeBSD < 7 is not supported by the upstream project anymore, so we
can simplify the code and rely on the QT_SOCKLEN_T definition in
common/posix/qplatformdefs.h instead.
Cherry-picked from 1afad60e6030064fee772c37e2647ae8c891ac2f to
qt5/qtbase.
Change-Id: I9883755070d2731b12b1113def17ca217d510d6a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Separate PPS based navigator event notification handling and implementation
of the actual event handling.
Like the similar refactoring for screen events, this will allow to reuse the
same event handler class for BPS driven event processing.
Backport of 4fac40f8b0e7b2a6f5f41eb82196e8b197bc851a
Change-Id: I388c2fc503db0fb4be7b80f82e280cf2c8b73015
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QWS used to have a line to change the composite mode from SourceOver
to Source for the top level widget. This wasn't used with QPA and I
removed the internal DontSetCompositionMode in qtbase. It turns out that
the QWS way is the most efficient one to initialize the background of
the widget.
The alternative is to have the QPlatformBackingStore::beginPaint
always clear the entire to be painted area and then paint the background
of the widget. The difference of painting each pixel once or twice is
noticable on embedded platforms and in the range of one to two fps.
This does come from Qt5. The change removes the hasFeature test as
CompositionMode_Source is available for all backends.
Reproduce the issue with:
echo "QWidget {background: transparent}" > style.css
./examples/widgets/wiggly/wiggly -stylesheet style.css
Task-number: QTBUG-24526
Change-Id: I3e3f8a263cd3cf9dec8628ca8a3bb28c70572121
Original-Id: Ica4c980bb3bf6eb87ddb5b510ac7493292d01543
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If VC++ 2010 Express and VC# 2010 Express are installed, then the
installation path is written in two places into the registry.
We're now filtering detected installations with the same installation
path.
Task-number: QTBUG-24956
Change-Id: I401430e7aa81d96c523d8172d2a2e9d40ebdb3ce
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 99a207436924aa1339f48ababa1490675c6a00d3)
|
|
|
|
|
|
|
|
|
| |
When building statically we need to hide the symbols that would
otherwise be exported so we add hide_symbols to the CONFIG
Task-number: QTBUG-23035
Change-Id: I29245a6650fa81186085484d7b2b9150b89a1729
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Separate PPS based navigator event notification handling and implementation
of the actual event handling.
Like the similar refactoring for screen events, this will allow to reuse the
same event handler class for BPS driven event processing.
Backport of 4fac40f8b0e7b2a6f5f41eb82196e8b197bc851a
Change-Id: I6896645aedd20e96fdabc7c49c7bd1d762de788f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
|
|
|
| |
This is a regression introduced by commit
d63910575949106f84dacf04abaa14fc866aa66b.
Task-number: QTBUG-24965
Task-number: QTBUG-25140
Change-Id: Ice9d90ebb81dcc3c0bc166eeb8f77a0ad9d99476
Reviewed-by: David Faure <faure@kde.org>
|
|
|
|
|
|
|
|
| |
It's a best practice to return 0 when the iface is
invalid.
Change-Id: I6dd70b53b975b10b75c246e6f8f7681da2bcb785
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
|
|
|
|
|
|
|
| |
Added QAccessiblePlainTextEdit, as an accessible interface for QPlainTextEdit
Change-Id: If0269a49b9fcd1b3e9fcfd32fac912560df28f21
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
|
|
|
|
|
| |
Change-Id: I4f968559a7371b87343cb5825eb83b0099364cf2
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Backport of:
657ca81c910638128f533b7eb98edf187bd40a0c
1c20c3f29441a6856c6eb58dda40b86bdaac6a06
from qtbase.
Change-Id: I2e30a16140eaf417a07674828642b74fc829bda8
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The fileLineEndingTest case doesn't test network in any way and it is
conceptually wrong, too, as any tests where line endings are an issue
should be handled with .gitattributes rather than forcing user to
check out the repo with unix line endings.
Task-number: QTBUG-24271
Change-Id: I73986993edc227cb68b8f61d51cc1cf458d20989
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
(cherry picked from commit fc8f92106d6743d4165de7d8a440b7e5dbd14391)
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Screen readers tend to announce progress.
Some applications (for example KMail) have hidden
progress bars that update frequently.
While the applications should be fixed, it's better
not to spam the user with continous progress announcements.
Change-Id: I5f3b5a83dc80594d995b10e58527115de8601c77
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Add new enums for future Symbian platforms.
Task-number: QT-4593
Change-Id: I23b616c6d62d9d56d2b8ec6ac7edb8f6a84211e8
Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Native side editor state sync request was added into
QCoeFepInputContext::CancelFepInlineEdit method to fix QTBUG-20919:
text prediction word list/bubble didn't disappear from TextArea/
TextField after a tap and the issue was fixed with the sync request.
However Symbian AknFEP was changed in Belle FP1 release so that this
sync request is no longer needed to get rid of the exact word bubble
when inline editing is canceled with a tap and it can actually
currently lead to a crash in the native side with certain input methods
as AknFEP doesn't expect FEP-aware text editors to request editor state
sync within MCoeFepAwareTextEditor::CancelFepInlineEdit call.
Thus the sync request should be made only with older Symbian releases.
Task-number: ou1cimx1#983695
Change-Id: Iab7753bbe8b279f89abc1853824a83ad210c5440
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
|
|
|
|
|
|
| |
Change-Id: Ibbdb74b5fb568153780355c1ebbd9e678b884c22
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
|
|
|
|
|
|
|
| |
The owner widget of a QAccessibleMenuItem may be NULL. Checking for a valid pointer before dereferncing.
Change-Id: Ic3149ccc5d6ae0ebc83dae58163ae2f60397fd28
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
|
|
|
|
|
|
|
|
|
| |
QTBUG-24709
QTBUG-24710
QTBUG-24711
Change-Id: I7b4034fae8b3b0ee43eb04ecce3c31479adb3b68
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
|
|
|
|
|
|
| |
Change-Id: I64467525d3365903e83b2e7e9cf381dd5a39c2b4
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
|
| |
taken from http://qt-project.org/forums/viewthread/15071
Change-Id: I701fb5a8d754afe9fcd6b327d779365673e07b5d
Reviewed-by: Alexis Menard <alexis.menard@openbossa.org>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is the collection of those earlier patches to libpng
in Qt that are still relevant, updated as required:
d6ba0e805fd2b17e2e0cbbce32e218551505d91f
91bf025444f13eb269ece6bb430a841638bb32a8
125dae45c5c8e09a58409095f6661ab65ea1e71f
d6947bcbed97889d7d56d400f81eb1691a3f18e1
Change-Id: I06603041b5971ade4742f600dbea4cca98ff95a5
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This commit removes the previous version of the bundled
libpng (1.5.4), as well as all local modifications to it.
It adds an unmodified copy of the official libpng
source distribution, except that various extraneous
files have been removed, as usual.
The patches required to build it in Qt will follow in
separate commit(s).
Change-Id: I0cfc782a1c1b7f06b92eb1b38992bd8a0e6de08d
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
On Mac if the toolbar was hidden in a unified title and toolbar main
window then it would have too much space between the title and the
central widget.
Task-number: QTBUG-24423
Change-Id: I5e434da2447f33795f3771e43b42930824482d8e
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
When the language menu was shown while IME composition was underway, it
would cause the composition text to be in an invalid state.
Task-number: QTBUG-25107
Change-Id: Iaf06f330fb055e30c25ccc9874f15132ea000bc2
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
|
|
|
|
|
|
|
|
|
| |
When the fontEngine() cached was updated for new parameters, we
would overwrite the cached engine, but not deref the old cached engine,
thus it would never be deleted.
Change-Id: I3b88698712e468ffa634bd98019a7871662cc363
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
When using Qt::ToolTip window flag, CS_DROPSHADOW style should be used
Task-number: QTBUG-13276
Change-Id: I4b8dfab0de38667188efe6cc8e1465bdf1ae2d18
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
|
|
|
|
|
|
|
| |
ATs need to be able to react to cursor movement.
Change-Id: I8fbb036b6a180f555505ab529020d0aea2d25e7c
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
|
|
|
|
|
|
|
|
|
| |
This leads to crashes in the unix bridge when notifying
about object destruction.
Task-number: QTBUG-25240
Change-Id: I24069a1c9e63d4c0a1f9b1336b94ab0712ac5ccf
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
I can't say for sure why q*linecontrol passes an empty rect to
the updateNeeded() signal when an input mask is set; presumably
the empty rect at some point has meant "full update", but there
are a few problems with this. Surely a full update is wrong,
even if the semantics have been lost in translation somewhere
(likely the qlinecontrol refactoring). This fix ensures
that empty rects from updateNeeded() are interpreted as a request
to update the whole widget. A further improvement would be to
ensure the line control doesn't request a full update when an
input mask is set. The cursor is usually wider when a mask is
set but because of QLineEdit::paintEvent()'s implementation,
there is currently a mismatch between the cursor width as seen
by q*linecontrol and what is actually drawn, which causes
rendering artifacts if updateNeeded() sends the cursorRect().
Since QLineEdit and Q*LineControl aren't actively developed, it's
best to keep this fix minimal, although the performance cost of
updating the whole line edit when an input mask is set is
unfortunate.
cherry-picked from qt5/qtbase a9cda515177db1615f8d47becf2aa781f26955ae
Task-number: QTBUG-7174
Change-Id: Ie51e015d760915e07b0220b770f04fc958d93a12
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
There was no implementation for "QDesktopServices::HomeLocation" and
"QDesktopServices::TempLocation" so adding the same.
Change-Id: I6bc58cb83eb64367d8b9eedeea8c43bc4dcad4b6
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
|
|
|
|
|
| |
Change-Id: I0eb1aa9cc6c3fd11ca530590cb6052fd69c720f8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Itemview were not following the established pattern
of keeping the referenced object in a QPointer.
This made them a lot more crash prone.
Change-Id: I210b112b9c3647b246fde2d6c69aba9ce8d25bd3
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
If the SSL dlls could not be loaded, then QSslCertificate::fromPath
will return an empty list. Make the test check for this before
triggering an assertion failure by calling first()
Task-number: QTBUG-25229
Change-Id: Ib6280c02130142201016a3f15ddb6bd44bfa0f9f
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
|
|
|
|
|
| |
Change-Id: Iacf8ef2032d5c229a7483d6993120684ee9bb04e
Reviewed-by: Jeremy Katz <jeremy.katz@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The installed path of libssl may include an element describing the
architecture, e.g. x86_64-linux-gnu or i386-linux-gnu.
In most cases, the libraries already loaded (static dependencies of
Qt, such as libc) will include the path where libssl is installed.
Use dl_iterate_phdr to find the paths. This is a linux specific
function, but it does provide "/lib/<arch>" and "/usr/lib/<arch>"
at the point ssl symbols are being resolved when running the
qsslsocket autotest (which has less dependencies than a typical
Qt app).
Task-number: QTBUG-24694
Change-Id: I9af8081f41bb85c2fcff450a2acda5672a7f7518
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
(cherry picked from commit e5337ad1b1fb02873ce7b5ca8db45f6fd8063352)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|