summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* mkspecs: Sync freebsd-g++40 and freebsd-g++.Raphael Kubo da Costa2012-04-171-35/+6
| | | | | | | | | | | 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>
* Do not define QT_AOUT_UNDERSCORE in freebsd-g++'s mkspec.Raphael Kubo da Costa2012-04-171-11/+0
| | | | | | | | | | | | | | 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>
* Remove the freebsd-g++34 mkspec.Raphael Kubo da Costa2012-04-172-129/+0
| | | | | | | | | | | | | | 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>
* Do not redefine QT_SOCKLEN_T in freebsd-g++'s mkspec.Raphael Kubo da Costa2012-04-171-9/+0
| | | | | | | | | | | | | | | 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>
* Refactor navigator event handlingKevin Krammer2012-04-170-0/+0
| | | | | | | | | | | | | 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>
* widgets/qpa: Fix painting to a fully transparent top level widgetHolger Hans Peter Freyther2012-04-161-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* qmake vc(x)project generator: fix VC++ Express detectionJoerg Bornemann2012-04-161-1/+3
| | | | | | | | | | | | | 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)
* Fix symbol visibility warnings when building uic3Andy Shaw2012-04-161-0/+1
| | | | | | | | | 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>
* Refactor navigator event handlingKevin Krammer2012-04-167-207/+348
| | | | | | | | | | | | | | | 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>
* Fix out of bounds use of QVector API.Stephen Kelly2012-04-133-6/+17
| | | | | | | | | | 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>
* Fix crashes in QAccessibleTree::navigateFrederik Gladhorn2012-04-131-1/+7
| | | | | | | | 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>
* Accessible interface for QPlainTextEditJosé Millán Soto2012-04-133-8/+83
| | | | | | | Added QAccessiblePlainTextEdit, as an accessible interface for QPlainTextEdit Change-Id: If0269a49b9fcd1b3e9fcfd32fac912560df28f21 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Use parentheses in statement with && and ||.Frederik Gladhorn2012-04-131-1/+1
| | | | | Change-Id: I4f968559a7371b87343cb5825eb83b0099364cf2 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Enable stack smashing protection on Blackberry platformsSean Harmer2012-04-132-0/+6
| | | | | | | | | | | | | 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>
* Remove fileLineEndingTest from networkselftest.Miikka Heikkinen2012-04-131-26/+0
| | | | | | | | | | | | | | 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>
* Only send progress bar updates when visible.Frederik Gladhorn2012-04-131-1/+2
| | | | | | | | | | | | 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 QSysInfo::symbianVersion() enumsPasi Pentikainen2012-04-133-28/+43
| | | | | | | | | | 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>
* Symbian: avoid crash when inline editing is canceledRiikka Inkila2012-04-131-3/+4
| | | | | | | | | | | | | | | | | | | | 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>
* Fix handling for key repeat events in the QPA linux input pluginReuben Dowle2012-04-131-1/+1
| | | | | | Change-Id: Ibbdb74b5fb568153780355c1ebbd9e678b884c22 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Fix possible crash issue when testing the state of a QAccessibleMenuItemYan Shapochnik2012-04-131-2/+2
| | | | | | | 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>
* Fixes crashes and memory leak in QMacPixmapDataAndreas Loew2012-04-131-13/+44
| | | | | | | | | QTBUG-24709 QTBUG-24710 QTBUG-24711 Change-Id: I7b4034fae8b3b0ee43eb04ecce3c31479adb3b68 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Fixed crash in QImage in out of memory conditionAndreas Loew2012-04-131-0/+4
| | | | | | Change-Id: I64467525d3365903e83b2e7e9cf381dd5a39c2b4 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* gcc 4.7.0 compatibility fix for javascriptMark Brand2012-04-122-2/+2
| | | | | | | | 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>
* Upgrading libpng: Patches to libpng 1.5.10 for Qt usageaavit2012-04-127-12/+40
| | | | | | | | | | | | 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>
* Upgrading libpng: Adding clean copy of libpng 1.5.10aavit2012-04-1242-23675/+3990
| | | | | | | | | | | | | | 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>
* Fix initial size of QMainWindow with unified title and toolbar on MacAndy Shaw2012-04-121-1/+1
| | | | | | | | | | 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>
* Ensure that the IME composition is handled correctly on MacAndy Shaw2012-04-123-5/+13
| | | | | | | | | | 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>
* Fix memory leak when drawing text in non-common scriptEskil Abrahamsen Blomfeldt2012-04-121-3/+10
| | | | | | | | | 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>
* Widget created with type to Qt::ToolTip should have a drop shadowKatja2012-04-121-1/+1
| | | | | | | | | | 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>
* Accessibility: send cursor move updates.Frederik Gladhorn2012-04-121-0/+5
| | | | | | | ATs need to be able to react to cursor movement. Change-Id: I8fbb036b6a180f555505ab529020d0aea2d25e7c Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Do not send QEvent::AccessibilityPrepare.Frederik Gladhorn2012-04-121-3/+0
| | | | | | | | | 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>
* Fixes a regression; missing cursor blink when input mask is set.Andreas Aardal Hanssen2012-04-122-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* QWS: Add support for HomeLocation and TempLocationBhooshan Supe2012-04-111-0/+5
| | | | | | | | | | | 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>
* Ukrainian translation updatedVictor Ostashevsky2012-04-111-10/+81
| | | | | Change-Id: I0eb1aa9cc6c3fd11ca530590cb6052fd69c720f8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Use QPointer to store accessible object.Frederik Gladhorn2012-04-112-86/+98
| | | | | | | | | 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>
* Make QSslCertificate test fail instead of crashShane Kearns2012-04-101-6/+12
| | | | | | | | | | 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>
* Fix compilation when QT_NO_CURSOR is definedRomain Pokrzywka2012-04-102-0/+7
| | | | | Change-Id: Iacf8ef2032d5c229a7483d6993120684ee9bb04e Reviewed-by: Jeremy Katz <jeremy.katz@nokia.com>
* Find libssl on linux using paths of loaded librariesShane Kearns2012-04-101-0/+26
| | | | | | | | | | | | | | | | | | | 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>
* Disconnect slots from the old sourcemodel in QIdentityProxyModelk.blammo@gmail.com2012-04-101-40/+40
| | | | | | | | | | | | | | | 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> (cherry picked from commit fae4a2555a9402e8cecf67242b29dca624cc61e8) Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* qmake vcxproj generator: properly escape XML attributesJoerg Bornemann2012-04-101-1/+1
| | | | | | | | Task-number: QTBUG-24954 Change-Id: I21299440ba3f268c2fa1e14d37003cdc3e6a35ad Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 0174c966f734ba48d387257a14447e8b56d85d37)
* QNAM: close the channel if bytesAvailable and nothing piplinedMartin Petersson2012-04-101-8/+2
| | | | | | | | | | | | If there are still bytesAvailable on the socket and we have nothing pipelined we should close the channel. This was not done before as the chunked decoder did not read the last CRLF. This has now been fixed so this close should be enabled again. Task-number: QTBUG-24875 Change-Id: I2ebdce1094282b055f4fd72ca642887c5f96c43b Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fix compilation when QT_NO_CURSOR is definedRomain Pokrzywka2012-04-102-0/+10
| | | | | | | | | | Although the QtDesigner module isn't built by default on embedded platforms, it's sometimes needed, mainly for dynamic form loading. The library contains a couple of setCursor calls which should then be #ifdef'd, as it's often a disabled feature for embedded UIs. Change-Id: I92d91249905848e73ee933e6f057a30b9cacb03c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Plug memory leak when gestures are grabbed but never triggeredAndy Shaw2012-04-101-93/+91
| | | | | | | | | | | | | | When a gesture is grabbed by QAbstractScrollArea but never triggered then the deletion of the QAbstractScrollArea would mean that the gesture created for it would not be deleted. This ensures that it always deletes the gestures waiting to be deleted even if no gesture event is triggered Task-number: QTBUG-25011 Change-Id: I36118b82baaa60ac4e014896159060e1af76b2d2 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com> (cherry picked from commit 3ec88b355b5c9649d128fcf18cb2abc39ac0e770)
* Made qt_accStripAmp handle "&&"José Millán Soto2012-04-091-12/+28
| | | | | | | | | | | | | Changed qt_accStripAmp implementation to handle texts which contains pairs of ampersands representing a single ampersand. In order to do that, a new static function called qt_accAmpIndex was created. This function is based on the code of qt_accHotKey, which was changed to use qt_accAmpIndex. Change-Id: Idcc5d07581d7fb3251c30399b189740ca8071104 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Fixes a problem with the proxy detection on WindowsThierry2012-04-051-2/+46
| | | | | | | | | | | | | | | | The current scheme is to use IE's default config. If that fails get the winhttp config. That's ok. The problem is that if you run a program as a service getting the IE config will set the fAutoDetect flag. But later the call to WinHttpGetProxyForUrl mightfail with the error code ERROR_WINHTTP_AUTODETECTION_FAILED. this patch just makes sure that we have a fallback winhttp solution in case the IE proxy is not set. The new code detcted if the current process is a service, in which case it will try to default to the system-wide proxy. Change-Id: I57e9082a46a8422c54f8f069715752c271a3a001 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fixed build failure in tools/qml for HarmattanGareth Stockwell2012-04-051-11/+11
| | | | | Change-Id: I6fb26f2da3ff78dd20d06941ae1aedd059f116ff Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Call wait() after calling quit() so that it can gracefully finishAndy Shaw2012-04-052-0/+3
| | | | | | | | | | | | There was a problem with slow https connections that if the download was ongoing when quit() was called then it tended to cause a crash because it tries to shutdown the SSL connection. Task-number: QTBUG-24594 Change-Id: I6b161bc7a9bb99e41849537462de2d7c92661902 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> (cherry picked from commit 46c58502639c25e5d19dd84d913b1208d5051db5)
* Fix signed/unsigned warnings (QWS)Sergey Gusarov2012-04-052-3/+3
| | | | | Change-Id: I98ba87fa236b1a10ea2499e270e71a94f54c1c3b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix clang warningSergey Gusarov2012-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | In file included from /home/sergey/code/QtEmbedded-4.8.0/include/QtGui/QDirectPainter:1: /home/sergey/code/QtEmbedded-4.8.0/include/QtGui/qdirectpainter_qws.h:56:1: warning: class 'QWSEmbedEvent' was previously declared as a struct [-Wmismatched-tags] class QWSEmbedEvent; ^ /home/sergey/code/QtEmbedded-4.8.0/include/QtGui/qwsevent_qws.h:269:8: note: previous use is here struct QWSEmbedEvent : QWSEvent ^ /home/sergey/code/QtEmbedded-4.8.0/include/QtGui/qdirectpainter_qws.h:56:1: note: did you mean struct here? class QWSEmbedEvent; ^~~~~ struct 1 warning generated. Change-Id: Iebda5efe8547b16e457486166a8abc8479b2fd8d Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Use value of LANG if LC_TIME is empty.Thomas Sondergaard2012-04-041-0/+2
| | | | | | | Task-number: QTBUG-24912 Change-Id: I68d91c02f5d82b7fc4cae0d2dedafb862a3b323b Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com> Reviewed-by: John Layt <jlayt@kde.org>
generated by cgit v0.12 at 2025-09-11 07:33:57 (GMT)