summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* OSX: Disable window restoration for the Mac font panelLiang Qi2013-08-231-0/+5
| | | | | | | | | | | | | because if it is automatically restored it's out of the application's control, so the user's interaction will be ignored. Change I8ce3cd94f5ae81d7877a346743ca4e0e188baa02 did this for normal windows by default, but the dialog helpers generate windows which aren't affected by that. Change-Id: I46ce3f85ee0c11dca778eb663c87774e322d6b6b (cherry-picked from qtbase commit c9182bc11b77675405941a0a163603cac064d8bc) Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* OSX: Disable window restoration for the Mac color panelLiang Qi2013-08-231-0/+5
| | | | | | | | | | | | | because if it is automatically restored it's out of the application's control, so the user's interaction will be ignored. Change I8ce3cd94f5ae81d7877a346743ca4e0e188baa02 did this for normal windows by default, but the dialog helpers generate windows which aren't affected by that. Task-number: QTBUG-31750 Change-Id: Ida063f2d36ab038af5e85de7dfa2acf61cb6dda2 (cherry-picked from qtbase commit 69554e458669c941130c2dc03d42a59ffd00e39e) Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Update for OS X Mavericks.Jake Petroules2013-08-212-4/+11
| | | | | | | (Qt 4 equivalent of qtbase/bd97768ae54d643270e824f74d152892dbea1b9f) Change-Id: I7ecebd2e185d61a0baeb5b47b802c2f760edeff3 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Fix unused private field warning in QMacMime.Jake Petroules2013-08-211-1/+1
| | | | | | | Does not apply to Qt 5. Change-Id: Ia1e5c5d8813a2285dd80189f7264d959ea8056c1 Reviewed-by: David Faure (KDE) <faure@kde.org>
* Use correct mask constant in the Windows event dispatcher.Friedemann Kleint2013-08-201-1/+14
| | | | | | | | | | | | | | Mask out QS_TOUCH, QS_POINTER when running a VS2012-compiled binary on pre-Windows 8 systems. Task-number: QTBUG-32257 Task-number: QTBUG-28513 Task-number: QTBUG-29097 Task-number: QTBUG-29435 Task-number: QTBUG-18852 Change-Id: I33ce3a659a234cb04d3b5ae9d668d193d681be7f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/54f1d7e2e48b896755aa930ee7e4ecacf51bf977)
* Revert "Disable precision timers when running MSVC2012 code on pre-Windows 8."Friedemann Kleint2013-08-201-5/+1
| | | | | | | | | | | This reverts commit aea654b84713b8085ee0a291e3325b1ca53080aa. Follow-up commit will fix the issue. Task-number: QTBUG-18852 Task-number: QTBUG-27266 Change-Id: Iadbae6b94de6e47e0b9bf428f57b63ffa286e382 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Only release when there is no lock on the objectAndy Shaw2013-08-201-2/+4
| | | | | | | | | | | | | | | | When the widget was unregistered for drag and drop then it would call Release() on the dropTarget before doing anything else. If the widget itself did not have a handle then this was not a problem. However in the case of a widget with a handle then it would call Release() before the lock on the dropTarget was released which would cause it to crash. Therefore it is moved so that it is called after the lock is released to ensure it can be released correctly. Task-number: QTBUG-13237 Change-Id: Iaec3eb8be3a4ea988218012e973f69cbcdcc45de Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Do not send clipboard message to application under debugger.Friedemann Kleint2013-08-191-0/+22
| | | | | | | | | | Fix Qt Creator hang when copying a stack trace from an application showing a runtime assert. Change-Id: I874bd48643ebce1a3551644dc850cb7cf5869522 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/333817b9cf1304cca7c1dbd45880115cd128f60e)
* Sun CC: Fix QFileDialog compilationSergio Ahumada2013-08-161-1/+1
| | | | | | | | | Only use the old getpwnam_r() function when _POSIX_C_SOURCE is defined. Task-number: QTBUG-21451 Change-Id: I6bfc4c9f784616fc08866542c34ed71ab69559e9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* restore QProcessEnvironment shared data thread safety on unixOswald Buddenhagen2013-08-123-8/+74
| | | | | | | | | | | | | | | | | | implicit sharing together with 'mutable' is a time bomb. we need to protect the nameMap, because concurrent "reads" may try to insert into the hash, which would go boom. we need to protect the key/value of Hash objects, because while the refcounting is atomic, the d pointer assignments are not, which would also go boom. we can simply use a QMutex to protect the whole environment, because it is very cheap in the uncontended case. Task-number: QTBUG-30779 Change-Id: Iaad5720041ca06691d75eb9c6c0e1c120d4a7b46 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> (cherry picked from qtbase/85e61297f7b02297641826332dbdbc845a88c34b)
* fix namespaced buildOswald Buddenhagen2013-08-121-2/+2
| | | | | | Change-Id: I9d0a3cb08de5e91807da7f0358c83b6693ebd1ea Reviewed-by: hjk <hjk121@nokiamail.com> (cherry picked from qtbase/da55d48ad731ee2499467b3e93e11eb3b53df89d)
* Mac: make windows not restorable on 10.7 and laterLiang Qi2013-08-111-0/+5
| | | | | | | | | | | | | | | | | The default value for NSWindow::setRestorable: is true, it means application will have some information for each window stored. After a crash happened and application relaunched, the application tries to restore those windows from the broken file. And then the "Retore Windows" will pop up. There is no workaround for application users or develoeprs. What they can do is to manually remove the the saved application state file for the application. To avoid that, better to switch it off. Task-number: QTBUG-28281 Change-Id: I4cc81b51b157139ff5e299e85a9bbce05f544219 (cherry-modified from qtbase commit 2aef22b77aa15eb0863a9585af77ccab04425dbd) Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Remove OS X unsupported warning.Jake Petroules2013-08-101-3/+0
| | | | | | | | | No other platform has such a warning and it really is not important. Change-Id: I70185dff6b0fad11c7a767f787679dc53d04ecc7 (backported from qtbase/cd17b500a85b34c16ff8f4212cf2ff35715040ba) Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Accessibility: ComboBoxes should expose their line edits as textFrederik Gladhorn2013-08-091-2/+5
| | | | | Change-Id: I6617635544c5b77f3768df949589bb91d08db33c Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* [WK1] NPStream::headers not initializedAllan Sandfeld Jensen2013-08-091-0/+1
| | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=119574 Reviewed by Alexey Proskuryakov. Initialize the header field. According to user feedback that should solve some cases of random crashes when loading plugins on Mac and Windows. * plugins/PluginStream.cpp: (WebCore::PluginStream::PluginStream): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@153828 268f45cc-cd09-0410-ab3c-d52691b4dbfc Task-number: QTBUG-32181 Change-Id: I45410e618cf0337ac1b2c8c4bafa572e8e1e0d19 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Add offset reading support in pnghandlerSamuel Gaist2013-08-081-0/+7
| | | | | | | | | | | | This patch adds the offset reading that matches the offset writing in writeImage Qt 5 fix commit 0b62a5d3c931aa4d91b986ec518567e9463a6360 Task-number: QTBUG-32674 Change-Id: I64f7e31049834ecbd052a061b79d3ed97e60e063 Reviewed-by: aavit <eirik.aavitsland@digia.com> Reviewed-by: Laszlo Papp <lpapp@kde.org>
* Link to correct function in QApplication documentation.Mitch Curtis2013-08-081-1/+1
| | | | | | Task-number: QTBUG-26123 Change-Id: Ieb15aac13b27cdbf6a2dfd7c157c366c07e9fb39 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Revert ea6ec4c781d5e94425b70f9f4e45d3e50eb12299Albert Astals Cid2013-08-081-3/+2
| | | | | | | | | | It has been discovered it changes the behavior of qdbuscpp2xml resulting in builds of some apps breaking. Even if the behavior is more correct, such behavior change in a stable branch is not acceptable Change-Id: I94826b06861188455779ee22218685951f0f8d6b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Include <new> instead of <ciso646> for libc++ detection.Raphael Kubo da Costa2013-08-061-1/+1
| | | | | | | | | | | | | As usual, MSVC does things differently and its ciso646 header does unexpected things, like #define'ing xor and causing all sorts of breakages. Include <new> instead: it should be as inocuous as ciso646 should have been. No backport because Qt5 does not have QT_NO_STL. Task-number: QTBUG-32773 Change-Id: I01a48ec2c726367e9498aeec4efb42f49d68bbe4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove a left over cast that is now semantically incorrect.Jake Petroules2013-08-051-1/+1
| | | | | | | | | CFPropertyListRef is a typedef for void*, which is why this code was compiling OK prior to this change. Change-Id: I67f2affeeb97459f85eedc8becb5d963557d34c3 (cherry-picked from qtbase commit fb25d6c7f6690402060027422343957c7d8ee718) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Make sure to also check for null CFPropertyLists.Thiago Macieira2013-08-051-0/+3
| | | | | | | | | | | | | In 1b08e0307dfebe561fbb0819a2d6b53edd8e8e93, I removed the null check by accident. It's possible for the Darwin API to return a null property list. Task-number: QTBUG-30760 Change-Id: Iaf0125767fe4b47c19810b70483a5219e94e4305 (cherry-picked from qtbase commit 96134c6f585963c9d449db17589f21e67519a2a8) Reviewed-by: Denis Dzyubenko <denis@ddenis.info> Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Don't assume that all CFPropertyListRef are CFArrayRefsThiago Macieira2013-08-052-7/+16
| | | | | | | | | | | | We might need more robust code in the future. But at least for this case it looks like a CFStringRef is also a possibility. Task-number: QTBUG-29776 Change-Id: Iaf50835122fcbb7e6e9c7fbf65e31e6143b2bc54 (cherry-picked from qtbase commit 1b08e0307dfebe561fbb0819a2d6b53edd8e8e93) Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Make libtiff link on OS X 10.9.Jake Petroules2013-08-051-9/+0
| | | | | | | Backport of Ie6f8639fb920e57289c7d0ad8952603abcfe7377. Change-Id: I9d0cd625734fda88a9564d4fef7b1f5e9f22c774 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Return the correct system font on OS X Mavericks.Jake Petroules2013-08-051-0/+7
| | | | | | | | Also prints a warning if other private system fonts are encountered. Task-number: QTBUG-32789 Change-Id: I04e1471d25119caddb587972561e98defb1ffda1 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Fix double transform for items ignoring parent transformations.Andreas Aardal Hanssen2013-08-051-3/+8
| | | | | | | | | | | | | | | | | | | Previously, the topmost untransformable's scene transform, which includes the item's position and local transformation, was used to determine the item's anchoring position. This position was then passed on to be multiplied by the item's transform again. This works fine for toplevel untransformable items that don't have any transform set at all, but those who do would have their transforms applied twice - one to determine the anchoring position, and again to transform the item itself. Since only translation transformations can affect the first operation (the anchoring pos), this bug only applies to items that set ItemIgnoresTransformations and use a local transform that includes translation. Task-number: QTBUG-21618 Change-Id: I3f3c4f2357e2ca6cd0c75cb5b7e428c0803d9e73 Reviewed-by: Alexis Menard <alexis@webkit.org> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Fix QListWidget item widget scroll bugSamuel Gaist2013-08-051-3/+1
| | | | | | | | | | This fix applies the patch uploaded in the bug report. The patch was provided by Qt-Commercial support but seems to have never found it's way to the sources although the bug was fixed in Qt 5. Task-number: QTBUG-27043 Change-Id: I41c5a7b8f3698bb4396046e5e74863e090ba185a Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Fix build regression caused by 7b7c321d5f35b6ee70db5a72d5d37e19e125d7cf.Jake Petroules2013-08-041-1/+1
| | | | | Change-Id: I54f4e0ca2ca677a41c22183263931c9d65896168 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* QHttpMultiPart: fix data corruption in readData methodPeter Hartmann2013-08-031-1/+2
| | | | | | | | | | | | | | | | When readData() is called repeatedly, we need to keep track which part of the multipart message we are currently reading from. Hereby we also need to take the boundary size into account, and not only the size of the multipart; otherwise we would skip a not completely read part. This would then later lead to advancing the read pointer by negative indexes and data loss. Task-number: QTBUG-32534 Change-Id: Ibb6dff16adaf4ea67181d23d1d0c8459e33a0ed0 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com> (cherry picked from qtbase/af96c6fed931564c95037539f07e9c8e33c69529) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Change QDBusPendingCallPrivate to full reference counting for deletion.Peter Seiderer2013-08-034-43/+58
| | | | | | | | | | | | | | | | Fixes race between QDBusConnectionPrivate::processFinishedCall() releasing the mutex before emitting signals (using various members of QDBusPendingCallPrivate) and deletion of the QDBusPendingCallPrivate object through QDBusPendingCall::d's destructor (a member of type QExplicitlySharedDataPointer<QDBusPendingCallPrivate>) leeds to segmentation fault with CrashTest example on slow/single core arm cpu). Task-number: QTBUG-27809 Change-Id: I3590d74d1cfa5816ede764b50b83a7008ec780ff (cherry-picked from qtbase commit 6c21f42657b494e24112c90d8b9fff719f1f8791) Reviewed-by: Peter Seiderer <ps.report@gmx.net> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove QDBusPendingCallPrivate::autoDelete logic.Peter Seiderer2013-08-032-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First step to fix race condition about deleting QDBusPendingCallPrivate. In a multithreaded application on a slow/single core cpu the following race (and segmentation fault) can occur: First thread A is running: A: QDBusPendingReply<> reply = pi->asyncCallWithArgumentList(method, argumentList); Then when the dbus answer arrives thread B will call: B: QDBusConnectionPrivate::processFinishedCall() B: ... B: locker.unlock() and runs until here, go on with thread A: A: reply.waitForFinished(); A: QDBusPendingCallPrivate::waitForFinished() A: { A: QMutexLocker locker(&mutex); A: if (replyMessage.type() != QDBusMessage::InvalidMessage) A: return; which returns immediately (mutex acquired, replyMessage alread set), now reply goes out of scope (destructor called) and QDBusPendingCall::d's destructor of type QExplicitlySharedDataPointer<QDBusPendingCallPrivate> deletes the reference counted object QDBusPendingCallPrivate. Now thread B continues, still in processFinishedCall() B: if (call->watcherHelper) B: call->watcherHelper->emitSignals(msg, call->sentMessage); B: B: if (msg.type() == QDBusMessage::ErrorMessage) B: emit connection->callWithCallbackFailed(QDBusError(msg), B: call->sentMessage); accessing alread deleted object QDBusPendingCallPrivate via call->... Fixed QDBusPendingCallPrivate deletion by proper reference counting will be done in the next commit. Task-number: QTBUG-27809 Change-Id: I15b3f0242471b62eaafadc763fb6a33339ff2fe1 (cherry-picked from qtbase commit 72ecf5a7ecb688a7e19cbc2f70e358a94d02edf7) Reviewed-by: Peter Seiderer <ps.report@gmx.net> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix unprotected access to QDBusPendingCallPrivate::pending.Peter Seiderer2013-08-031-2/+9
| | | | | | | | | | | | | | | | | | | | | In QDBusConnectionPrivate::waitForFinished() pcall->pending was used after the protection by pcall->mutex was released. A simultaneous call to QDBusConnectionPrivate::processFinishedCall() was able to reset pcall->pending to null before it was used for the q_dbus_pending_call_block(pcall->pending) call. Fixed by releasing (and setting to 0) of pcall->pending in processFinishedCall() only in case no one is waiting yet, otherwise release pcall->pending by the first thread waiting in waitForFinished(). There is still a race condition about deleting QDBusPendingCallPrivate (too early) which will be fixed in the next two commits. Task-number: QTBUG-27809 Change-Id: I040173810ad90653fe1bd1915f22d8dd70d47d8c (cherry-picked from qtbase commit 64e3bd481e5d54d555959ceecbd5c4576c571241) Reviewed-by: Peter Seiderer <ps.report@gmx.net> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QDBusPendingCall: add a missing QWaitCondition::wakeAll() callMarc Mutz2013-08-031-0/+1
| | | | | | | | | | | | In QDBusConnectionPrivate::waitForFinished(), threads that see pcall->waitingForFinished == true go to sleep on pcall->waitForFinishedCondition, but there was no call to waitForFinishedCondition.wakeAll() anywhere in the code, so add it. Change-Id: I8d068dc0cc4f20786eb40fd7e2bb9840d8b70c7f (cherry-picked from qtbase commit 20d7763b19400c062a07f440cc601f486be4039b) Reviewed-by: Peter Seiderer <ps.report@gmx.net> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Don't crash if the relayed signal was emitted from the wrong threadThiago Macieira2013-08-031-1/+9
| | | | | | | | | | | | | | Under normal circumstances, this should never happen. Signals exported to D-Bus should only be emitted from the object's own thread. That's the only way for the receiver (the QDBusAdaptorConnector object) to know what the sender object and signal were. If they are emitted from another thread, the sender will be null. Task-number: QTBUG-31932 Change-Id: Ia5a45d648985e0645bffd4abc0881fca9da64f79 (cherry-picked from qtbase commit d94961d08f91696824d9035f666af5fe28d59ef6) Reviewed-by: Peter Seiderer <ps.report@gmx.net> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* [Qt][WK1] navigator.plugins shows too few entries.Michael Brüning2013-08-011-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Backport r153517 from webkit trunk and Qt 5 to Qt 4.8. https://bugs.webkit.org/show_bug.cgi?id=119332 Reviewed by Jocelyn Turcotte. Based on input by Choon Sik Cho. WebPlatformStrategies::getPluginInfo was using the WTF::Vector::resize method wrongly. This patch removes the call to Vector::resize as Vector::append will take care of increasing capacity if needed. * WebCoreSupport/WebPlatformStrategies.cpp: (WebPlatformStrategies::getPluginInfo): Task-Number: QTBUG-30141 Change-Id: Ief250ee98c4c5d2cb5165d6da3d7b43c54cbd7c8 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Expose invokables that are not slots in the xmlAlbert Astals Cid2013-07-311-2/+3
| | | | | | | | | Without it the invocations were working but were not listed on introspection Backported from Qt5: qtbase commit c3f485c5250a503832e767e1fe5e40595126f6c5 Change-Id: Ie62f7dc3577f52b6888ddebf0392fdf51f2845a5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QNX: adapt SSL lib file name lookup heuristicsPeter Hartmann2013-07-311-1/+4
| | | | | | | | | | | | | | | | | | I.e. do not try to load file names that are not there anyhow. The code would search for libcrypto.so.1.0.0 and libssl.so.1.0.0, while on QNX the libs are called libcrypto.so and libssl.so, and there are no symlinks with version numbers. This saves ~ 45 ms in real apps (tested with Facebook, Twitter and Foursquare), and ~ 24 ms at app startup in an isolated app without GUI (difference maybe because threads are fighting for CPU or so). Task-number: QTBUG-32548 (backport of commit 69b31f7b657a7ca611ad980c2974597de160598c) Change-Id: I33e1c9e2c490b9c7f94aca06add8dc183cce083d Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Sun CC 5.10 supports Template-Template ParametersSergio Ahumada2013-07-301-2/+4
| | | | | | | | See http://www.oracle.com/technetwork/systems/cccompare-137792.html Task-number: QTBUG-18879 Change-Id: Icb08771527a718c1ce4f0919116c3834cf979be4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QNX: hardcode on-demand SSL root cert loadingPeter Hartmann2013-07-301-0/+2
| | | | | | | | | | | | The c_rehash'ed symlinks are always there on QNX, so no need to check at every app start for the feature. This saves ~ 17ms at each app start. Task-number: QTBUG-32549 (backport of commit 28ff65f4dc67349ff88e4cd161b6bced7e9bf477) Change-Id: Ibcc2b5fee806d4a885657746516f4682df2bfa29 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Cleanup QFileIconProviderPrivate::getWinIcon().Sergio Martins2013-07-251-23/+18
| | | | | | | | | | | | No functionality is changed, just made the code more readable and removed some duplication. Needed to backport qtbase/46685f755b01288fd53c4483cb97a22c426a57f0. Code in Qt5 is already clean, no commit necessary there. Change-Id: I29fe871eeb0b45b619434e7941cc673033366f63 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* HTTP internals: do not access reply that was deleted alreadyPeter Hartmann2013-07-251-0/+3
| | | | | | | | | | ... rather than crashing. Task-number: QTBUG-32404 (cherry picked from commit 78f9f4b4970e6f4155b7cf2e88c6ac540dec47bc) Change-Id: Ibdffcb9f57e841655998cf72d0ee8206b4987aa7 Reviewed-by: Richard J. Moore <rich@kde.org>
* Move the declaration of QFileIconProviderPrivate to it's own file.Sérgio Martins2013-07-233-33/+92
| | | | | | | | | | | | | Needed to backport qtbase/46685f755b01288fd53c4483cb97a22c426a57f0 to Qt4. We can't add new symbols in Qt4 to QFileIconProvider so we will make the private class a friend of the QFileDialog. Change-Id: Ic720d681da14698ecf8557e1223d82bda6b33e23 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> (cherry picked from qtbase/f4a0d6d2494d1dd41cd5b854a48b435120714d32)
* Add support for the Linux/m68k platformThorsten Glaser2013-07-223-0/+257
| | | | | | | | | | | | | | | Add necessary support code to recognize m68k as an architecture; use GCC builtin atomics like avr32 does. Copy avr32 header, since it was hinted that including it from m68k was not liked. This is not needed in Qt5 because it’s said to automatically use the GCC atomic builtins. Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=660963 Task-number: QTBUG-28237 Change-Id: I6c51405c47549c904899a6971b6cd34b8239c642 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Use GET method for redirect in QDeclarativeXMLHttpRequest.Friedemann Kleint2013-07-221-0/+5
| | | | | | | | | Initial-patch-by: Marek Więckowski <wiecko@fuw.edu.pl> Task-number: QTBUG-32332 Change-Id: I393308134d60e484464e0cfc6cdcdac1edc27f8d Reviewed-by: Peter Hartmann <phartmann@blackberry.com> (cherry picked from qtquick1/e0f7b22341339b77aafa9150b0d79e320e9e4180)
* Fix warning when building objects with a Q_OBJECT macroTobias Hunger2013-07-221-1/+1
| | | | | | | | | | | Do not trigger a self-assign warning when running into code containing a Q_OBJECT macro. Currently this happens a lot e.g. when using clang to build code using Qt. Change-Id: I68995624b18406f337318599e463f36f87486e66 (cherry-picked from qtbase commit 1416f4c595d6078c08f93483695e0b64c7fbb2a7) Reviewed-by: Milian Wolff <milian.wolff@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* evdev tablet support on LinuxShawn Rutledge2013-07-182-1/+4
| | | | | | | | | | Nowadays on at least some distros XInput presents the Wacom and other tablets with the TABLET atom instead of separate STYLUS and ERASER. Task-number: QTBUG-25329 Change-Id: I24d86be63ac2ffdeeb042d91644610feb6c9f4e7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* QNetworkProxyFactory: check all the proxy environment variablesAdrien Bustany2013-07-161-2/+17
| | | | | | | | | | | QNetworkProxyFactory used to check only for the http_proxy environment variable in systemProxyForQuery. This patch makes it look as well in https_proxy, ftp_proxy and all_proxy. http_proxy is still used as a fallback value. Change-Id: I7934af70d191cd17dbce3b3789260ae1a8332986 (cherry-picked from qtbase commit a7d1b6419d7503474ed5e02f7fb984e4ad5f9219) Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Add missing argument to QBasicUnixFontDatabase::fallbacksForFamily()Takumi Asaki2013-07-162-2/+3
| | | | | Change-Id: I403745b8c734092078011b56fa0373981d9ad119 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Validate qmlEngine() in QDeclarativeItem::mapToItem() function.Leonard Lee2013-07-151-1/+1
| | | | | | | | | | We protect against the fact that engineForScript() can be called with 0 or something else. Task-number: QTBUG-29572 Change-Id: I92f62b328d1e84a378449e0857569886f327077c Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Consider virtual screen when determining dock widget visibility.Friedemann Kleint2013-07-131-2/+5
| | | | | | | | Task-number: QTBUG-32260 Change-Id: I8b28e3869a6e3b1ed12a311dfa0100979098fc4b Reviewed-by: Andy Shaw <andy.shaw@digia.com> (cherry picked from qtbase/6c37fb70d695df001999c78a27ca50d6d2ac6517)
* Accept defeat when select(2)ing without a monotonic clockThiago Macieira2013-07-121-6/+2
| | | | | | | | | | | | | | | | | We prefer to use the monotonic clock because it's never affected by time jumps (such as the user changing the date, or the system adjusting for any other reasons, including automatic leap seconds). But if a system doesn't have a monotonic clock, we simply accept the regular, real time clock and hope it doesn't jump. This is better than the current code that never restarts a call. The side-effect is that a 30-second select may become a 3630-second select if someone sets the clock back one hour. Task-number: QTBUG-22301 Change-Id: Ia5a3bb453cd475f45b03637e2549165589fd2524 (cherry-picked from qtbase commit c64d602df3712c0d147b7b689d29f79c700e63bc) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
generated by cgit v0.12 at 2025-08-26 03:08:00 (GMT)