summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* [SIC] Make non-const the QRegExp methods that modify the internalsThiago Macieira2012-04-283-18/+13
| | | | | | | | | | | These methods modify QRegExp internals and should not have been const. It's actually dangerous to have them const, since users may think it's safe to use the matching method in a thread-safe manner. Task-number: QTBUG-25064 Change-Id: Ia370eb42fd0407a94924f420297c5e83d3908214 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Doc: Fix most qdoc errors in QtSql.Casper van Donderen2012-04-2835-237/+299
| | | | | | | | | - Move 2 images from qtdoc. - Add "make docs" command for qtsql - Fix qdoc command usage errors. Change-Id: Id2f0548d09ed8f77b2317863d443c19d1cccdd83 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* qdoc: Further changes to the QML specializationMartin Smith2012-04-283-63/+87
| | | | | | | | | | The <qmlPropertyGroup> tag now has an id attribute of the form "id-qml-propertygroup-xxx" where the xxx is the property name. //This should be unique within the document. Change-Id: I20b30266dbe92b85b60400de30ebf9b1f1e292ea Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Don't generate compiler warnings for using deprecated methodsLars Knoll2012-04-281-1/+4
| | | | | | | | | | | We need to construct QImageTextKeyLang objects for the deprecated method in QImage. That's impossible to do if we don't have a constructor for the class that's non deprecated. So add a private constructor and make QImage a fried of the class so it can use that constructor. Change-Id: I6359e9943fe031ed3dca85479ee9ec47ceaf776b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Get rid of some deprecation warningsLars Knoll2012-04-281-3/+3
| | | | | Change-Id: I05e6f9479789652cc1536cb5bced2bc8fa664c84 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Re-enable casting to and from "ASCII" on tst_qstring.cppThiago Macieira2012-04-281-33/+13
| | | | | | | | | | Turns out that we've had some old unit tests commented out that did not compile. QString does not have a std::string constructor nor overloads to many other methods. And std::string does not cast to char* on its own. So these tests need to be removed. Change-Id: I22df66fc3ccc68bc2840f2d83747234418e480f5 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Don't use the QRegExp methods that modify the object [QtCore]Thiago Macieira2012-04-274-4/+6
| | | | | | | | | | | | | | QRegExp matching methods modify the object, which we don't want to. In particular, when we receive a QRegExp from the user or we store in a context that might require thread-safety, make sure we make a copy before using it. QRegularExpression has no such shortcoming. Task-number: QTBUG-25064 Change-Id: Icf22986cd5f6fd086518c78a7d56e6cadfe9f5f6 Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Wrap the non-ASCII testcases with QString::fromUtf8Thiago Macieira2012-04-271-5/+5
| | | | | | | And use QString::toUtf8() to recover the byte array original. Change-Id: Ic94de12e7ac67479e85a64a86f8467428b4d22ba Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Wrap all Latin 1 strings with QString::fromLatin1 or QLatin1StringsThiago Macieira2012-04-276-47/+49
| | | | | Change-Id: I1a1891b9126a2546c1872ec25aba9581cc84bb2f Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Convert these files to ASCII or UTF-8Thiago Macieira2012-04-272-2/+2
| | | | | | | Remove all non-UTF-8 sequences from source code in Qt. Change-Id: I46d9cb23ef2199894896f171d553b3144822f36c Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Force tst_qstring to use fromLatin1 where it has Latin 1 literalsThiago Macieira2012-04-271-37/+39
| | | | | Change-Id: I941d20733da2987ca7ced14c314adebaf6a431f6 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix QWindow autotest for Windows.Miikka Heikkinen2012-04-272-8/+20
| | | | | | | | | | | | | | | The test was flawed, as it didn't process queued events before checking for received event counts, which caused window minimum size enforcement triggered resizes to be missed. Added event processing steps before critical checks and also increased the size of the windows so that event counts are predictable also on Windows. Note that this might also fix the issues this test has on Mac, but I can't test that. Task-number: QTBUG-24904 Change-Id: I01a4bd1ddabcf3650a8abff67b03c75b9c40a626 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove old Qt4 to-do comment.Jason McDonald2012-04-271-3/+1
| | | | | | | | | Addressing the comment would likely break existing applications, so leave things as they are for now. Task-number: QTBUG-25099 Change-Id: I7dfd0e1ae121dcae57c2babc3373c2e5d16ad44b Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Move QWinEventNotifier data members to a private classShane Kearns2012-04-272-20/+33
| | | | | | | | | | This is a binary incompatible change to allow future changes to QWinEventNotifier to be possible in a binary compatible way. Change-Id: I268d3e01d8ee237ecbd164ee0f7cae1eb73dd725 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Debao Zhang <dbzhang800@gmail.com>
* Replace QGuiApplication::activeWindow by focusWindow().Friedemann Kleint2012-04-274-4/+4
| | | | | | | Fix deprecation warnings. Change-Id: I8d33aa8c035df6f5ef3fff6a402e980e43e03406 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Windows: Fix warning about retrieving the handle from non-toplevels.Friedemann Kleint2012-04-271-2/+3
| | | | | Change-Id: I967f218c98309e77371717aa16e46995a767caa3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* QWindowsBackingStore: Flush to correct window.Friedemann Kleint2012-04-271-1/+2
| | | | | | | | Task-number: QTBUG-25435 Change-Id: I13f57a328a7ac3402fe0def9d724f7e700016c80 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove deprecation tags from QWheelEvent.Morten Johan Sorvig2012-04-271-4/+2
| | | | | | | | | | | | 0df1c9f1 enabled deprecation warnings from Qt, causing warnings from QWheelEvent use. Using delta() and orientation() in new code is still not advised, but since QtWidgets uses them the "deprecated" tag is not suitable. Change-Id: I597e8ddf9fd2dc911d0e30044e96df744982ff81 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Windows/Vista style: Fix painting of QGroupBox.Friedemann Kleint2012-04-271-16/+29
| | | | | | | | | | | | QGroupBox in Vista style does not show a frame, currently. drawBackgroundDirectly should also be called if the paintDevice is a backing store. Task-number: QTBUG-25395 Change-Id: Ifa20802dea6c182904f68271ddd0d175007e4b0e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix warning about int-truncation (MSVC2010, 64bit).Friedemann Kleint2012-04-271-1/+1
| | | | | | Change-Id: Idfc483ccb80a8bbad128672052edfa04635bd532 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* doc: removed wrong license headers from several .pro snippetsRohan McGovern2012-04-275-200/+0
| | | | | | | | | | | | qmake can't parse /* C-style comments */. The license headers in these files should use # as the comment delimiter. However, .pro files anyway don't need license headers, so just remove them. Continues from commit 8dea79701579f78023c6b40c4b5cbea278bc62c1, which removed the header from one file. Change-Id: Ib227aabb27224fc1fe89b7ced4fbbf7b1af8b193 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Add QMetaMethod::fromSignal() functionKent Hansen2012-04-274-0/+81
| | | | | | | | | | | | | | | | | | | | | | | Given a member function that's a signal, returns the corresponding QMetaMethod. Inspired by the implementation of the template-based QObject::connect(). The primary use case for this function is to have an effective and exact (not subject to shadowing) way of checking whether a known signal was connected to in reimplementations of QObject::connectNotify(QMetaMethod), avoiding string comparisons. Example: void MyObject::connectNotify(const QMetaMethod &signal) { if (signal == QMetaMethod::fromSignal(&MyObject::mySignal)) { // Someone connected to mySignal ... } } Change-Id: I5e4de434275fe543c004d569dcaa9ceda3442f03 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Fix workaround for image readers that can scale but not clipaavit2012-04-271-5/+1
| | | | | | | | | | | If both scaling and clipping was requested from an image reader that only supports scaling, the code failed to apply the intended workaround (i.e. read normal and do clipping and scaling afterwards). Ref. the comment just above about "Only enable the ScaledSize option if ..." Change-Id: I273edba60bf9f785f2082aa8f236505ec3ce0776 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Implement inline downscaling in png reader, to save memoryaavit2012-04-273-62/+157
| | | | | | | | | Instead of allocating and reading the entire image and then scaling it down, this code reads only one line at a time and scales it on the fly. Change-Id: I61fde307146c11dcd90ca617cc2e7f85dd3b66c4 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Removed parallel_test from parallel-unsafe autotest.Rohan McGovern2012-04-271-1/+0
| | | | | | | | | This autotest passes when run alone, but sometimes fails when run concurrently with other tests. Change-Id: I327de7f4a9f8af385351e4c6b09a57311efd6eb6 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* Respect the DontUseNativeDialog flag.Christoph Schleifenbaum2012-04-274-19/+14
| | | | | | | | | | | | | QFontDialog and QColorDialog were ignoring the DontUseNativeDialog. This lead to a native (Cocoa) dialog created all the time. Fix the testcase for QFontDialog. It needs the DontUseNativeDialog flag set. Task-number: QTBUG-24321 Change-Id: I159c1ad057bac38226f1e01a56b15f142650bfd8 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* cmake: temporarily set tests/auto/cmake insignificant on macRohan McGovern2012-04-271-0/+6
| | | | | | | | | cmake was installed on CI macs _after_ this test was added, causing the test to block unrelated changes. Temporarily disable it as previously agreed with Stephen Kelly. Change-Id: I079c0016a5e4a9a03ee1a0bae9a2e836c6b985d6 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Mark that the Sun compiler includes the return type in the manglingThiago Macieira2012-04-271-0/+1
| | | | | | | | | | | | | | | | | | Source: http://developers.sun.com/solaris/articles/external_linkage.html %dem __1cFgreet6F_pc_ __1cFgreet6F_pc_ == char*greet() Source: http://www.oracle.com/technetwork/articles/servers-storage-dev/stablecplusplusabi-333927.html Function Mangled Name float f(float) __1cBf6Ff_f_ int f(int) __1cBf6Fi_i_ int T::f(int) __1cBTBf6Mi_i_ int T::f(char*) __1cBTBf6Mpc_i_ int T::U::f(int) __1cBTBUBf6Mi_i_ int N::T::f(int) __1cBNBTBf6Mi_i_ Change-Id: Ibe1934f1c137d1657fb122cbf1a1b1fbc3e4a202 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* QDoc: Pretend that .qtx and .qtt files are .qdoc files.Casper van Donderen2012-04-271-1/+1
| | | | | | Change-Id: I2b530e526d2c1f5102960dab4991ceade414f1eb Reviewed-by: Ed Baak <ed.baak@nokia.com> Reviewed-by: Peter Yard <peter.yard@nokia.com>
* fix build with mingwKonstantin Ritt2012-04-271-17/+17
| | | | | | | since MinGW is GCC, invert the order and place the GCC constructs first Change-Id: I98113aa77e51f9e01c3641987e915bf475053a60 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fixed iOS compilation issues.Ian Dean2012-04-261-2/+2
| | | | | | | | Put MacOS-specific code in #ifdef blocks so that it is not compiled for iOS. Change-Id: I303b7dbb63eb298e92351951731868df6a38bffa Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Revert "Harfbuzz-shaper - fix incorrect logClusters being set in ↵Eskil Abrahamsen Blomfeldt2012-04-261-35/+13
| | | | | | | | | | | | | | HB_OpenTypePosition" This reverts commit add629d4f16a536fc56d55727195e3247b621a54. The commit caused crashes when laying out some text (e.g. ordinary Arabic text) with certain fonts (it triggered the assert in QTextLayout::addNextCluster()). The regressions will have to be weeded out before the fix can be recommitted. Change-Id: Iee457f138367d4cf8fcbd2e518271d8eaa95a62c Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Uncomment qnetworkproxyfactory autotestShane Kearns2012-04-261-1/+1
| | | | | | | | | It no longer requires hardcoded configuration, and it passes on linux, mac 10.6 and windows desktops Change-Id: Ibaa63520dade58ce13c23cf2aba3ddbc5be1c472 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Fix memory leaks in 64-bits ODBC driverHonglei Zhang2012-04-261-2/+4
| | | | | | | | | | | | | | On 64-bits Windows system, integers and longs are still 4 bytes values. Several functions that were previously defined with SQLINTEGER and SQLUINTEGER parameters have been changed where appropiate to use new SQLLEN and SQLULEN typedefs. SQLGetStmtAttr() is one of these functions. This fix replaces SQLINTEGER with SQLULEN in appropriate functions to avoid memory leaks. Task-number: QTBUG-25256 Change-Id: I744927f42b8578ece60815df360e3b337ebf452a Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* get rid of Q_*_EXPORT_INLINE macrosKonstantin Ritt2012-04-265-89/+37
| | | | | | | | | | | | > Girish: > We should be able to remove the macro completely today, > just mark all those functions as plain inline. > With Qt5, we don't have to worry about bc yet. this fixes "import attribute ignored" warnings on mingw with -fno-keep-inline-dllexport Change-Id: I616e5de7c8d59953ce03a316b941a439fae56298 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix C++11 compilationOlivier Goffart2012-04-261-6/+6
| | | | | | | | Fix compilation with compilers that support user defined literal (such as GCC 4.7) Change-Id: I31cd3d2177688f963ab33cf68cd6060a5fb8640f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Create interface for navigator calls and implement for BPS and PPSKevin Krammer2012-04-2611-100/+665
| | | | | | | | | | | | Makes QQnxServices available on non-BPS systems by delegating to an interface which is implemented on systems with BPS using the currenly used navigator API and on systems without BPS by sending an appropriate message to the navigator's PPS service interface. Change-Id: I0e32fb11e6debb7b7b4693c0bc02af4f75ee2162 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Take account of spanned items in QTreeView when dragging.Stephen Kelly2012-04-262-32/+42
| | | | | | | | | | Also remove some code which has been unused since it was introduced in 32182d107fa75e5619ecc91a81f50626f429ebe1 Task-number: QTBUG-25140 Change-Id: Ic7053d68d8200f845c1ae330342d27af7275e057 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@digia.com> Reviewed-by: David Faure <faure@kde.org>
* Doc: Use the proper way to find qdoc.Casper van Donderen2012-04-262-2/+4
| | | | | | | | Previously $$QT.core.bins was used to find qdoc, the proper way is to use qtPrepareTool(). Change-Id: I5d97f5517ae63253ccaf1fb1487034c3a312a074 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Doc: Add "make docs" command for QtXml.Casper van Donderen2012-04-263-1/+4
| | | | | | | Also fix a typo in the qhp/index URL. Change-Id: I5774982b15f9de5b59966a2d932307b156eecc7f Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* QDoc: Disambiguate prev and next links in html source.Casper van Donderen2012-04-261-2/+2
| | | | | Change-Id: Iaa82b9b6de71b577a44eae86eb6847c07d068670 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
* Map QAccessible::Role to the proper IA2Role.Jan-Arve Saether2012-04-261-1/+10
| | | | | | | | All enum values after the MSAA-specific roles needs a special mapping. Change-Id: I6c77abf09b68d2d3d772937be986d532db2e5292 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Use non-blocking reads on virtual keyboard pps device.Sean Harmer2012-04-261-1/+6
| | | | | | Change-Id: Iad350c948049128f3014a6ad6536ac9dc2ee86d5 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com>
* Fix compilation when debug output enabled on virtual keyboardSean Harmer2012-04-261-1/+1
| | | | | | | Change-Id: I467e9ef624bcd10cb5b61f6f665a7bbb0bb1f57a Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com>
* Make QTimeLine test significant.Jason McDonald2012-04-261-1/+0
| | | | | | | | Known failures in this test are now handled by QEXPECT_FAIL. Task-number: QTBUG-24796 Change-Id: I12ba57370cf3df1a85a108fbbcdc9db2222491c1 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Ensure that QUrl::{to,from}LocalPath encode/decode properlyThiago Macieira2012-04-262-1/+37
| | | | | | | | | | | | | | | Unlike path(), toLocalFile() isn't reporting a URL component, so it should decode the percent-encoded characters fully. This extra decoding pass is meant to catch %00 to %1F, %7F and %25 (the percent sign itself). It also catches %80 to %FF, which aren't decoded because they don't form UTF-8 sequences. That means QUrl::toLocalFile() has undefined behaviour if the path contained non-UTF8 sequences. Task-number: QTBUG-25459 Change-Id: Iab5a0ba6afcfc4510e297984f2ffc208cedd752b Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Added mkspecs for iOS.Qt4iOS2012-04-2636-0/+1532
| | | | | | | | | | Modified common MacOS gcc config for iOS compatibility. Added iOS mkspecs for iOS devices and simulator using G++, LLVM-G++ or CLANG compilers. Change-Id: If0a0b1a3ce4e0dc4db319a315e227a9d31549399 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove deprecated conversion from QKeySequence to QStringOlivier Goffart2012-04-262-2/+2
| | | | | Change-Id: I3844913c16b9d6222f48e66dddc1d680458ffa56 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Fix QRawFont autotest in WindowsMiikka Heikkinen2012-04-252-3/+10
| | | | | | | | | | | | | Can't use style name with Windows native font engine, so do the comparison using style in case multipleRawFontsFromData(). Also XFAILed the advances() case when using Freetype font engine in Windows, as some of the advances returned are one pixel wider than expected. Task-number: QTBUG-24197 Change-Id: Ib5fecd83a93908e57a4c82ffb5495a92474ce45a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove QMetaObjectExtraData and put everything into QMetaObjectOlivier Goffart2012-04-2512-112/+46
| | | | | | | | | | | | | | | | QMetaObjectExtraData was added when support for QMetaObject::newInstance was added. One needed a place to put the pointer to static_metacall in the QMetaObject. But as we break binary compatibility, one can change the size of QMetaObject, and put everything back inside QMetaObject's own structure. Meaning it is not required anymore to have one QMetaObjectExtraData instance per QMetaObject anymore. Change-Id: If0b8f586cbaf633eed10045adee3ba3366826c86 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>