summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Cocoa: Fix beep-on-show for Creator menus.Morten Johan Sorvig2012-04-302-30/+21
| | | | | | | | | | | | | | | Maintain a current window state variable in QCocoaWindnow and use it when setting the new window state on the NSWindow. The NSWindow state accessors can apparently not be trusted, in particular isZoomed always returns true for the Creator popup menu. Change-Id: I78f13de251f3730752813bba17459011f8558aee Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Christoph Schleifenbaum <christoph.schleifenbaum@kdab.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Remove unused codeLars Knoll2012-04-301-3/+1
| | | | | | Change-Id: I185db2361990dd1d503488a364826738270388b5 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Disable force_align_arg_pointer function attribute with MinGW-w64Jonathan Liu2012-04-301-1/+1
| | | | | | | | | | The force_align_arg_pointer function attribute is not necessary for MinGW-w64 to align stack for SSE and generates a compiler warning as it is ignored. Do not use force_align_arg_pointer with MinGW-w64 to silence the warning. Change-Id: I58a754dc3ec01b36a1d3c9490f45ccf0824468ba Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix the tst_QOpenGL::sharedResourceCleanup() test case in WindowsMiikka Heikkinen2012-04-301-0/+1
| | | | | | | | | QWindowsGLContext was returning always false for isSharing() query, as it was falling back to default implementation. Task-number: QTBUG-24192 Change-Id: I884d559d69545ef85a0d07d7287bc50ce459c1bd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Use BPS based event dispatcherKevin Krammer2012-04-307-2/+354
| | | | | | | | | | | | | | | Create a QPA specific subclass of the blackberry event dispatcher (basically the BPS equivalent to the QUnixEventDispatcherQPA created by createUnixEventDispatcher()). Create an event dispatcher event filter that will receive all BPS events and then either handle them itself or delegate to event subtype specific handlers. Change-Id: I112e0274156727d3aa9e5693b59d041c65be4daf Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Remove declaration of QWindowsFontEngine::createEngine()Miikka Heikkinen2012-04-301-5/+0
| | | | | | | | | There is no implementation for this function so might as well remove the declaration. The function is actually implemented by QWindowsFontDatabase class, where it is also properly declared. Change-Id: I8f5c050fa3f3c48b07e10f205eb0f7b16e12b737 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Removed insignification from QBackingStore testMiikka Heikkinen2012-04-301-3/+0
| | | | | | | | | The test is passing in CI for both Mac and Windows, so removed the insignification from it. Task-number: QTBUG-24885 Change-Id: Ida39d98b72e49fc82358d016b8de725bbfc5d6de Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove unused private and protected members from QClipboardLaszlo Agocs2012-04-303-30/+0
| | | | | | Change-Id: I1d5ce0db4a9a6582629e2c0b74e9ab998b405788 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix Qt::MouseButton Documentation for Qt::ExtraButton24,stockton2012-04-302-6/+6
| | | | | | | | | | | | | | | Documentation for the 'more mouse buttons' feature has a Typo on Qt::ExtraButton24 (is shown as "Qt::ExtraButton44", no value.) Also, the order of BackButton/Xbutton1/ExtraButton1 causes the 'BackButton' value to be a forward reference to XButton1, which makes it awkward and hard to understand. Same with ForwardButton/ XButton2/ExtraButton2. Task-number: QTBUG-25529 Change-Id: I04b76d91d7a2155c1917a809a51700059320f510 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Remove insignification of lancelot test on Mac OS X.Jason McDonald2012-04-301-2/+0
| | | | | | | | | This test has been passing consistently since the previous crash was skipped in commit 6dbd00b12052d749492763ee2a768d952fdddba9. Task-number: QTBUG-22792 Change-Id: I41ac001a3b9e16cde4d674dc9f34ab2dffb848cd Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove insignficiation from qgraphicsscene test on Windows.Jason McDonald2012-04-301-2/+0
| | | | | | | | | This test has been passing consistently since it started running in CI. Task-number: QTBUG-24295 Change-Id: If2a163607ae72cae9e28619dd5de1b333aea4ed9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove insignification from qsslsocket_onDemandCertificates_* testsJason McDonald2012-04-302-4/+0
| | | | | | | | These tests have been passing consistently since they started running on Windows in CI. Change-Id: I4505497afc477a7f4fbda0acc29987d0d0cf220a Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Remove insignification from qtcpserver test on Mac OS X.Jason McDonald2012-04-301-2/+0
| | | | | | | | This test has been passing consistently since starting to run in CI. Task-number: QTBUG-25445 Change-Id: Id024921b18ea4ef94ad2f47d9db2ccda3212eaaa Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Remove insignification of qsslsocket test on Windows and Mac.Jason McDonald2012-04-302-6/+3
| | | | | | | | | | | | The test has a single stable failure on both of these platforms. Mark the failure with QEXPECT_FAIL (that was already the case on Ubuntu 11.10) and re-enable the test. Note also the elimination of duplicate bug numbers. Task-number: QTBUG-24234 Change-Id: Ica11e7d1f3cd9487647127984fef7c75e0e764fe Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fix MinGW-w64 compilationJonathan Liu2012-04-301-3/+3
| | | | | | | | | Use qintptr and quintptr for exchanging data with registers for cpuid as the size of long does not match the size of the register on Win64 which uses the LLP64 data model. Change-Id: I23b8c8e0977166f7e62795c16e9080e44d9f25f5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* If a dependency was not found, and we were not called with REQUIRED, we are ↵Stephen Kelly2012-04-291-0/+6
| | | | | | | | | | not found. This only works with CMake 2.8.8, but it is no harm to earlier versions. Change-Id: I62c220e4b24f951e83c23eb57d5f833de4d181c5 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Properly quote the dependencies string.Stephen Kelly2012-04-291-1/+1
| | | | | | Change-Id: I319b04cdb21860652658ee8d3e577d41a913ed5a Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Get rid of most warnings related to QInputMethodLars Knoll2012-04-292-9/+14
| | | | | Change-Id: Id0b1235a5dc209c5c06e0a64613364c89e733005 Reviewed-by: Pekka Vuorela <pekka.ta.vuorela@nokia.com>
* Make sure different modules do not overwrite each others dependencies.Stephen Kelly2012-04-291-2/+2
| | | | | | Change-Id: I30ca05d3c692a707cfe829ad5fee099549bab540 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Forward the REQUIRED and QUIET arguments when finding dependencies.Stephen Kelly2012-04-291-1/+10
| | | | | | Change-Id: I5d7c26f12a296ac3527575149978b18c5e9a4a67 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Simplify the cmake version check.Stephen Kelly2012-04-291-1/+1
| | | | | | Change-Id: Ifdd89397f88b090a6b43d40636dbeac029faaed8 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Add some more useful output when about the cmake versionStephen Kelly2012-04-291-1/+1
| | | | | | Change-Id: I58efa1f295dbc652b1882937ca27ea52d9f4a923 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* [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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 16:35:38 +0000