summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* tst_qtextscriptengine: make it compilable under MSVC2010Debao Zhang2012-06-261-2/+6
| | | | | | | | | | Source files which contain UTF-8 literals can not be compiled by MSVC with Chinese/Japanese locale. Change-Id: I5daa2e45c5e1ceb86da91e72288c24018c49c0f6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Fix compilation for XCB-without-XlibGiuseppe D'Angelo2012-06-261-1/+1
| | | | | | | | | Commit 6481218da13539529b87626a352a17f42c57be61 broke the build by removing the #ifdef XCB_USE_XLIB guards, but forgetting to port Button1 to the XCB equivalent. Change-Id: I9102feceb4deb0135ce0df318e46b35d1134a0b9 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* mkspecs: Use the right variable name to find the qdevice.priHolger Hans Peter Freyther2012-06-261-1/+1
| | | | | | | | | Commit 8b822825c5066957622194acf0fc267a6bf473fd introduced the /get version but used the wrong variable name. Fix it by using QT_HOST_DATA. Change-Id: Ia4759b8c6ff2de9726f3aebae2f2f39c6644d4ec Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Don't try build devicediscovery if evdev is not available.Robin Burchell2012-06-261-1/+1
| | | | | | | Fixes build on Android. Change-Id: I1e6af972e8c29dd4c38773985e8f201064c2164f Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Fix QIODevice warning when running rcc.Mitch Curtis2012-06-262-10/+54
| | | | | | | | | | | | | | | | | | When opening a QFile on stdout, for example, we must not call seek as it is a sequential device. This has been flagged as a warning since commit Ie3a96d3a and has resulted in spurious warnings being emitted. In the case of opening a QFile in Append mode, QIODevice::open already sets the position marker, so calling seek is redundant. This is also true for the file engine's open function (called through openExternalFile()), which also ensures the handle or descriptor is repositioned appropriately. Task-number: QTBUG-26104 Change-Id: I71040c399efe54e7538f54433368b432e959e08d Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* clean up specdir()Oswald Buddenhagen2012-06-262-8/+6
| | | | | | | | | the only callers which used non-default arguments are gone now, so remove the arguments entirely. this also enables us to re-enable result caching. Change-Id: I62f76e17e531a4eeafddb9b29716ca0a0eb3dbea Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* fix -spec/-xspec argument re-assemblyOswald Buddenhagen2012-06-262-2/+10
| | | | | | | | | | the specs in Option are now only fixifiable absolute paths if an actual path was passed on the command line - otherwise these are just names, and we should pass them on verbatim. Change-Id: I5b3535dadf2d6b2b3116331e6636f6e363a5361f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Add missing subdirs (the new QUrl unit tests were not compiled and run)David Faure2012-06-262-0/+3
| | | | | | Change-Id: I1b39d92b8a14d5aeca957180858e1980a534894b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Fix PCRE build under non-__GNUC__ compilersGiuseppe D'Angelo2012-06-261-4/+6
| | | | | | | | | | | | | | | | | | | | PCRE's JIT has several paths that end in a #error under compilers that don't #define __GNUC__. This is because either - those platforms were unavailable to PCRE devs so they were not tested; - the #ifdef guards inline assembly fragments in GCC (AT&T) syntax; - the #ifdef guards functions present f.i. in ARM's EABI and unavailable f.i. under WinCE. This commit disables PCRE's JIT under ARM and MIPS unless __GCC__ is defined. The MIPS #define from MSVC (_M_MRX000) is also dropped. Change-Id: I59f959c321413845ffbdf1ac32740b400422e0ee Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
* Remove toRect_normalized().Robin Burchell2012-06-261-11/+0
| | | | | | | Seems to have been unused since qt4's fde7475bcf9c10522a8170e6eb8fb9a8fadc21cd. Change-Id: I7ec88fb4ca8c1ffda469a1c048b4fea17ff042bc Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix warning when ibus is not available.David Faure2012-06-262-11/+3
| | | | | | | | This is perfectly ok on a linux desktop, so no reason to abort when setting QT_FATAL_WARNINGS. Change-Id: I64ba987679195741631fb204af57ae3d283bb516 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* QPlatformWindow: Add Window masks.Friedemann Kleint2012-06-2611-5/+139
| | | | | | | | | Add functionality for window masks to QPlatformWindow, which is required to implement QWidget::setMask() in order to fix the regression in functionality from Qt 4.8. Change-Id: I2c2d5629f0b4c6d90e52595ad70b13559aab1f41 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Make QRegion not need to be friends with QVectorThiago Macieira2012-06-261-3/+2
| | | | | | | | | | This hack was introduced in Qt 4.5 and the intention was to resize (hopefully, shrink) the QVector without causing it to reallocate memory. We can accomplish the same by reserving the size: until we clear() or squeeze(), the container will not free memory. Change-Id: I03a09537a617be0ce865eefa043005e4051e8706 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* make using testlib automatically "promote" all modules to -privateOswald Buddenhagen2012-06-263-3/+4
| | | | | | | | | | | | autotests often need private headers (especially with qpa headers now being private) and have no compatibility requirements, so it makes sense to just use the privates of requested modules. this also suppresses the useless warning about using privates, in case they are still explicitly specified. Change-Id: I9e499bedcf6ef25777283ff1432cef7254e9093a Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* ignore mkspecs/modules-inst/Oswald Buddenhagen2012-06-261-0/+1
| | | | | | | only generated files in there Change-Id: I6eb327fc686af08d46d343066420525bc2e0dde5 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Make QGtkStyle build with QT_NO_FILEDIALOGSukhyun Kim2012-06-263-0/+12
| | | | | | | | Fix compilation failure with qconfig large Change-Id: I8ae14f01879b94430dcbb5c85c61d14e922f6eb9 Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Factorize the cmake test infrastructure to be reusable.Stephen Kelly2012-06-262-50/+52
| | | | | | | | This makes it easy to add cmake module tests for all modules. Change-Id: I303bf7674ca6ae7a8544488f96e8e02afbaa6ff0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Avoid macro re-definition after 1838a6c2fb5e3b4368c871aa330d028b255b83afKonstantin Ritt2012-06-269-9/+9
| | | | | | Change-Id: I2631ff687881278ba42edacd237a2130c103b69f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* QIODevice: free memory when buffer is clearedMartin Petersson2012-06-262-5/+9
| | | | | | | | | | | | | | | The QIODevicePrivateLinearBuffer does not deallocate any data on readAll or clear. This fix will change the buffer so that data is deallocated on clear, readAll and when read emptied the buffer. This is needed for QAbstractSockets that don't have readBufferMaxSize set, as the buffer will grow but never decrease in size when you read from it. Change-Id: Iab42e40182f9ebe0739c99b2d1e820ce287dc931 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QAbstractSocket: Enable readNotifier on read from bufferMartin Petersson2012-06-265-1/+29
| | | | | | | | | | | | | | This is needed for the QSslSocket. When we read on that socket we will only read from the QIODevice buffer to get the unencrypted data. So when the readNotifier has been turned off on the plainsocket there is nothing to trigger it to be turned on again. This will add a readData with zero size when we have read everything from the buffer. This is so that we get a call into the socket to check if the readNotifier should be turned on again. Change-Id: I3b63e33de007db823e964480903186eb1b8caac2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QtNetwork: remove double buffering on socketsMartin Petersson2012-06-266-141/+55
| | | | | | | | | Removes the readBuffer from the QAbstractSocket since data is already buffered in the QIODevice. Change-Id: I4e50b791fd2852455e526fa2c07089d4d3f0b2a4 Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* [QNX] Enable MT screen event handling on BlackberryRafael Roquetto2012-06-263-6/+29
| | | | | | | | | | | | | | | | Consuming incoming screen events through the BPS event dispatcher on its current incarnation has proven to be very inefficient since it cannot put up with the screen event throughput. This patch enables the screen event thread also for Q_OS_BLACKBERRY platforms, in addition to stock QNX. This behavior can still be configured through the project file, though. Task-number: QTBUG-26177 Change-Id: I98a3b22549c9fbf0c16b5a8c39a55c1eaa6ec1f4 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Fixed inputMethodQuery() for Qt::ImHintsTasuku Suzuki2012-06-264-20/+77
| | | | | | | to return QWidget::inputMethodHints() Change-Id: I46735c553e0cb4689cd0c53a69d07ed61ba56bf6 Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* QTBUG-26035: Remove positive sign from start of stringTarja Sundqvist2012-06-262-1/+19
| | | | | | | | | | | | Updated removeGroupSeparators(QLocalePrivate::CharBuff *num) so that it removes also positive sign ('+') at the start of the string. Auto test included. Task-number: QTBUG-26035 Change-Id: I8e0e071d6c682d9192a8c6bb2f282510e21b3c48 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* fix somewhat common edge case in $$shadowed()Oswald Buddenhagen2012-06-263-4/+8
| | | | | | | | | | | | if source and build dir are direct children of the common root and we are shadowing the top-level source dir, there is of course no trailing slash to match. Change-Id: I8a34a6a72d16cb21d77d056e037235af9b32a008 Reviewed-by: Davide Pesavento <davidepesa@gmail.com> Reviewed-by: Andreas Hartmetz <ahartmetz@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Use valSeen since it results in unused warning otherwiseGirish Ramakrishnan2012-06-261-1/+2
| | | | | Change-Id: Iccfa4b895d9e50227efa1747ea20ce07ce70327e Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Don't re-evaluate the lib location.Stephen Kelly2012-06-261-4/+4
| | | | | | | Rely on the DESTDIR variable being set correctly by qt_module_config. Change-Id: I1a166124024722ec5a189a7402b38646179aa890 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix the DEFINITIONS for Qt modules.Stephen Kelly2012-06-261-3/+2
| | | | | | | | | As the DEFINITIONS to be used for QtAddOns is different to essential modules, rely on the logic in qt_module_config setting this variable correctly. Change-Id: I64485ccd6df093216cac4a97fb1cfaac0122a218 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QGraphicsItem::setAcceptsHoverEvents is deprecated, replace itThiago Macieira2012-06-262-2/+2
| | | | | | | | | It is replaced by setAcceptHoverEvents (note the lack of s), even though the original name made more sense -- "set (if this item) accepts hover events". Change-Id: Ia6137c0e37b0a5932836f1d08fb8fa436f736eed Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Replace the QGraphicsItem deprecated transforming functionsThiago Macieira2012-06-267-12/+12
| | | | | | | | | The scale(), rotate() and translate() functions are replaced with QGraphicsItem::setTransform. Change-Id: Icb81c71b1513c049e2fd607995ca3a868108ee30 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Andreas Aardal Hanssen <andrhans@cisco.com>
* Small documentation fix about the text streams default encoding.Lars Knoll2012-06-251-2/+2
| | | | | | | | It's UTF-8, not Latin1 on most systems nowadays. Only Windows still living in the past... Change-Id: I70f1bd7a49bed6dcc8e39bbc0f0613475791afdb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QSKIP test that is blocking unrelated changes in CIShane Kearns2012-06-251-2/+2
| | | | | | | | | The test looks vulnerable to misbehaviour if the working directory contains unexpected files and folders. As it's already skipped on Mac, skip on linux as well to unblock the CI. Change-Id: Id2e48ea455eb77e36c4f9d899885e101f674c0a3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* We shouldn't have a Makefile here.Lars Knoll2012-06-251-9/+0
| | | | | Change-Id: If55952b4aa9b95ff9311c1b7338b77af62a5c503 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove the font codecsLars Knoll2012-06-2512-902/+2
| | | | | | | | These codecs have only been used for XLFD based fonts. These are not supported anymore by Qt 5. Change-Id: I7dc083f2efcd42363b144b24bd62c169d83390cf Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* The codecForTr() should be utf8Lars Knoll2012-06-251-1/+1
| | | | | | | | tr() assumes utf8 as input encoding, not latin1. Change-Id: If834f8c169bdb431d78713d14b03542d3a7ca8e4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix docs mentioning Q_EXPORT_PLUGIN2Lars Knoll2012-06-257-7/+7
| | | | | | | | Fix all remaining places where Q_EXPORT_PLUGIN2 was being used in the documentation. Change-Id: I7be67b83c18545d0e74f250b4b26583444b01909 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Use the new plugin systemLars Knoll2012-06-253-6/+3
| | | | | | | | Convert the last remaining three plugins over from the old plugin system. Change-Id: I355e6bb068ec4afb58a2ee9542f86e2913b3851d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix return type of isActiveConfig("host_build")Simon Hausmann2012-06-241-1/+1
| | | | | | | | The return type of isActiveConfig is a boolean, so return that when host_build is queried. Change-Id: I6d1420b49b09e51442c4b2d482e2f19b165081d8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make qtbase compile with QT_NO_DRAGANDDROPTasuku Suzuki2012-06-243-5/+10
| | | | | | Change-Id: Ief16e435af6e6d246b84505a1c1208994c7b0b38 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Jeremy Katz <jeremy.katz@nokia.com>
* Ensure that no extra bits can leak into QUrl::toEncoded.Thiago Macieira2012-06-241-1/+1
| | | | | | | | | | Technically, this function should take QUrl::UrlFormattingOptions, but that doesn't exist. So we just mask out the high bits that determine the encoding options. toEncoded only supports one encoding way: fully encoded. Change-Id: I1445ad7c292500921ec2672be4524d7d76a39f98 Reviewed-by: David Faure <faure@kde.org>
* add possibility to set $$MODULE_IMPORT_SUFFIX in module .pri filesOswald Buddenhagen2012-06-241-1/+1
| | | | | | | | quick1 got a suffix, so we need a way to set it Change-Id: I099b868106abd4d3040047703472faa65f694f31 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Make qtbase compile with QT_NO_CSSPARSERTasuku Suzuki2012-06-241-0/+1
| | | | | Change-Id: Iadcc7dfde6b06c339118c00a645d9dc592a0eead Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Wrap QObject usage in qsharedpointer_impl.h with ifndef QT_NO_QOBJECTThiago Macieira2012-06-241-0/+2
| | | | | | | | Otherwise, bootstrapped tools like qmake and moc won't compile, unless QObject is forward-declared (which it isn't anymore). Change-Id: If67ca1cd8fdb7b29628f9dc4b454595d26a715d0 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Remove documentation for QIconEnginePlugin::keys().Robin Burchell2012-06-241-10/+0
| | | | | | | Method was removed in dcf3c95175a93cf883e14a6d434b4306df50cf37. Change-Id: I6c01ea7d329e15aec8b4ce29e8d3d5c3e784731a Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Guard evdev specifics with QT_NO_EVDEV.Robin Burchell2012-06-241-0/+4
| | | | | | | Android fails the evdev configure test at present. Change-Id: I1cbaf2dab589f647c02c8c5b92f72bd5159ccfa9 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Set Wayland as default platform on Raspberry-PiDonald Carr2012-06-241-1/+4
| | | | | | | | | Update Raspberry-Pi mkspec to indicate that wayland is the default platform for the Raspberry-Pi. Change-Id: I10b30ecfb16faed6027137225d9e95409faa7e87 Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Fix setMouseTracking on QGLWidgetLaszlo Agocs2012-06-232-7/+0
| | | | | | | | | Remove the function altogether. Alternatively we could call the base class implementation but there is no reason to keep this confusing, non-virtual override. Change-Id: Ie8724f7bbc6666fdace7ff777bcde99f3d8a9561 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Make test work on Mac OS XHarald Fernengel2012-06-232-0/+2
| | | | | Change-Id: I0c2d9bc7500972144d44060f38bc7a5da65ed30f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Don't operate on bogus data, assert on preconditions insteadJoão Abecasis2012-06-232-13/+6
| | | | | | | | | | | | | | | | | | | | | | QVector::erase shouldn't try to make sense of iterators it doesn't own, so the validation being done here is bogus and dangerous. Instead, it's preferrable to assert, the user needs to ensure proper ownership. The case of erasing an empty sequence is not checked for preconditions to allow QVector v; v.erase(v.begin(), v.end()); , while being stricter on other uses. Autotests were using ill-formed calls to the single argument erase() function on an empty vector and were fixed. This function erases exactly one element, the one pointed to by abegin and require the element exist and be valid. Change-Id: I5f1a6d0d8da072eae0c73a3012620c4ce1065cf0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Skip 3 test methods if the test server isn't set up.David Faure2012-06-232-3/+8
| | | | | | | | This makes things easier for developers touching QtCore and running all QtCore unit tests. Change-Id: I7aa832a6a1be07d90cacad2eecb2364285ff3818 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 22:57:34 +0000