summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Cleanup of QWindowsVistaStyle.Friedemann Kleint2012-01-262-28/+25
| | | | | | | | | | - Remove the limbowidget, try to obtain HWND from a toplevel or the desktop instead. - Clean up handling of the theme map, avoid operator[] and repeated invocation of of map.end() Change-Id: Ic5ea6186508f37aaff782ca304ce577899f7b41c Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
* Made QWindow::currentOrientation() a property.Samuel Rødal2012-01-265-9/+20
| | | | | | | | | | | | | | To match the previous QWindow::orientation() property which can be useful to access from QML. Also, removed the automatic translation of Qt::PrimaryOrientation to QScreen::primaryOrientation() on the QWindow level, as it leads to a lot of complexity regarding the QWindow::contentOrientationChanged() signal, and makes it hard to distinguish between the case where the window's orientation follows that of the screen, and the case where the orientation just happens to be set to that of the screen. Change-Id: I6950d1337b7f929815eff1328181855090d8066b Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Wrap unimplemented clang feature in __has_featureOlivier Goffart2012-01-261-4/+13
| | | | | | | | So that when they are actually implemented in future version, the proper defines get defined. Change-Id: I5cc3e3ef64b06facc27e6d697700dcb7a96300d5 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Fix a couple of edge cases for WildcardUnix matchingAndy Shaw2012-01-262-2/+4
| | | | | | | | | | | | | | Fix a couple of cases where WildcardUnix was not matching when the string was just [] or ended with a \. The testWildcardEscaping() test has been extended to account for these two cases too. Integrate 7ce3726aea4be2dfdb57966a4482f66fec6f8f57 from 4.8 Task-number: QTBUG-20897 Change-Id: I7a07ac008473fa7a080db752e189f6404842603f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove QTextControl and QLineControl.Andrew den Exter2012-01-259-5669/+4
| | | | | | | | QtWidgets and QtDeclarative now both have their own versions of these so there's no need to keep them around any longer. Change-Id: I9c2201c8495a0a0816e2af16c8f647fcad991479 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Cleanup mess in public type ids.Jędrzej Nowacki2012-01-25136-55/+212
| | | | | | | | | | | | | | | | | | There is no reason to keep two separated core types sets. It couldn't be fixed before Qt5 because of binary compatibility promise. This patch merges QMetaType core types with ext core types. This "simple" operation consists of: - QDataStream version was incremented, because type ids are saved in QVariant's data stream. - QMetaType LastExtCoreType and FirstExtCoreType were replaced by LastCoreType, FirstCoreType and new QMetaType::HighestInternalId. - New tests checking QVariant data stream for Qt4 and for Qt5 versions were added. Change-Id: I02dd74d29317365c297a789a4eb7c9c5edc3b231 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Fix building of configure.exe.Friedemann Kleint2012-01-251-0/+2
| | | | | | | Add missing files to profile. Change-Id: I72ccbbbef3e036fc0cfe7a0a6df4c19d0474b798 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* QAbstractSocket / QSslSocket: add API to pause and resumePeter Hartmann2012-01-259-49/+277
| | | | | | | | | | | | | | | pause and resume is currently only supported upon emitting the QSslSocket::sslErrors() signal. The API was added in QAbstractSocket to also support QAbstractSocket::proxyAuthenticationRequired() in the future. This is the first patch to support that feature on the socket level, another patch will follow to support sslErrors() and authenticationRequired() in QNetworkAccessManager / QNetworkReply. Task-number: QTBUG-19032 Change-Id: Ide2918268590ab9a01454ab26cb7fdca3dc840ab Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Introduce QGuiApplicationPrivate::windowForWidget.Friedemann Kleint2012-01-251-3/+15
| | | | | | | Change getHWNDForWidget() to take a const QWidget *. Change-Id: I6b0d0bce70487304dfcd4e7a6a039fe8c7ca4aae Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Windows Vista Style: Fix drawing of buttons in message boxes.Friedemann Kleint2012-01-253-6/+5
| | | | | | | | | Do not use the HDC of the backing store when drawing to an image (as opposed to 4.8, where the HDC of the paint engine was used). This causes 'ghost buttons' to appear in the dialog box at 0,0. Change-Id: I301b66abf4447a65ee144f09655b68efaf18700d Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
* Widgets: Enable Windows styles on Windows.Friedemann Kleint2012-01-251-1/+1
| | | | | Change-Id: I1f1a675ad52da2bfb8988d91012d725469d1cac9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Mark the enumerator QVariant::Type as obsolete.Stephen Kelly2012-01-251-0/+1
| | | | | | | | | | In most cases, QMetaType::Type should be used (contains more entries) and in APIs an int should be used to allow for user-extended metatypes. Change-Id: Iaa768f6d510686da36c61b8aaf5de3ac53a6f463 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* bearer: run the bearer engines in their own worker threadShane Kearns2012-01-253-18/+30
| | | | | | | | | | | | | | | | | | | | | | | | The original architecture of the QtNetwork bearer support hosted the engines in the application's main thread, but this causes some problems. If the QNetworkConfigurationManager is constructed in a worker thread, then it is populated asynchronously without any notification when it is done (the app gets incomplete or missing results) Fixing that by restoring the earlier behaviour of using blocking queued connections to wait for the lists to be populated caused a regression, as some applications deadlock because the main thread is waiting on the worker thread at this time. By introducing a dedicated worker thread for the bearer engines, QNetworkConfigurationManager can be safely constructed in any thread while using blocking queued connections internally. Task-number: QTBUG-18795 Change-Id: Iaa1706d44b02b42057c100b0b399364175af2ddb Reviewed-by: mread (cherry picked from commit 5f879c55e531165cc2569b03c3796d0f33d0a0b7) Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Alex <alex.blasche@nokia.com>
* Don't lose the fontDef when setting the size of a raw font.Pierre Rossi2012-01-251-1/+1
| | | | | | | | | QFontEngineFT::cloneWithSize, which is used among other things by QRawFont::setPixelSize, should create a new font engine using the font definition from the current font engine. Change-Id: I9415422bbecc2bf7b7acf105c12c1c83a894526c Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Mark QStringList as movable.Stephen Kelly2012-01-251-0/+2
| | | | | | Change-Id: I27fb523c43ace195d04d729c800669246a1930d7 Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fixed fileiterator issue for WEC7.Janne Anttila2012-01-251-0/+2
| | | | | | | | | | | | | | WEC7 does not support FIND_FIRST_EX_LARGE_FETCH with FindFirstFileEx, but windowsVersion for WEC7 is still resolved as WV_WINDOWS7. If the FIND_FIRST_EX_LARGE_FETCH flag is passed to FindFirstFileEx in WEC7, the method does never find any files from given directory. Changed FIND_FIRST_EX_LARGE_FETCH flag to apply only when Q_OS_WINCE is not defined. Task-number: QTBUG-22503 Change-Id: Ic38cf745cda7ee7b23da67dc390ac0e6d04158cd Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
* Remove use of QT_MODULE from libraryGunnar Sletta2012-01-25561-732/+25
| | | | | | | | | | These defines were there to aid in the commercial licensing scheme we used long ago, and are no longer needed. Keep a QT_MODULE(x) define so other modules continue compiling. Change-Id: I8fd76cd5270df8f14aee746b6cf32ebf7c23fec7 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* moc: Use QMetaType::QVariant as the type for QVariantKent Hansen2012-01-255-15/+20
| | | | | | | | | | | | | | | | | | | QMetaType::QVariant has existed as a proper type for almost two years, but the qvariant_nameToType function was written in 2006. Using QMetaType::QVariant means QVariant can be treated just like any other type. We can get rid of those hacky checks for LastType, and the remaining checks become more readable. The fact that QMetaProperty::{type,userType}() returned LastType (0xffffffff) for QVariants was never documented (LastType itself is internal). But there are other Qt modules that assume so. I'll fix the ones I know about (qtdeclarative, qtscript, activeqt). Change-Id: I799b9079bb8bbb1fe76c132525440b30415cbac5 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Add Native Client port mkspecs.Morten Johan Sorvig2012-01-258-0/+210
| | | | | | | Support cross-compiling for x86 and x86_64 nacl. Change-Id: I652702f9671b35963450c42dac5e27bedc698df0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* tst_qobject: Run as console application.Friedemann Kleint2012-01-252-3/+3
| | | | | Change-Id: If3049249cf8ceeb0985d158209e217455bfc3c47 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Make coordinates float based where it makes sense.Lars Knoll2012-01-255-29/+33
| | | | | | | | | Mouse and Hover events already use FP corrdinates. They also make sense for tablet and drop events. Task-number: QTBUG-20115 Change-Id: Iff35d1f468567bd5a37236853dbc7725a37d87f2 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Included stdlib.h to allow malloc() usageRafael Roquetto2012-01-251-0/+2
| | | | | | | | Depending on indirect inclusion was a mistake and caused compilation to break on the QNX (BlackBerry NDK 2) target. Change-Id: I447aec68bfe02447639a096c0c2f928bd4381cd9 Reviewed-by: David Faure <david.faure@kdab.com>
* remove vestiges of text codec pluginsMark Brand2012-01-252-9/+0
| | | | | | | follow-up to 3a3356a85079d734dfa57205a00e1996afc033df Change-Id: Iba84958cbcd105ec702568752090719cc108e101 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove support for the MNG file format and the bundled libmngaavit2012-01-25111-99915/+11
| | | | | | | | | | | | | The MNG file format is generally abandoned, and libmng has been unmaintained for several years. The MNG plugin and bundled libmng has been moved to the qtimageformats project on Gerrit. Task-number: QTBUG-21869 Change-Id: I946432347014ffde2b72307a5f8b166ca5553602 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Add a changed() signal to QValidator.Andrew den Exter2012-01-255-1/+76
| | | | | | | | | This provides a general notification of changes that may change the validity of previously validated input. Change-Id: I5ec6f127af60fdca68605fee903a08758bc01360 Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix a compile error in qsql_sqlite2.cppLars Knoll2012-01-251-0/+8
| | | | | | | | | The compile error got introduced due to the change in QMetaType requiring fully defined types for pointers. Change-Id: I6383ff5923fc1d5bd3c1161e2823e83f2a06a99e Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Document where modelReset() is emittedSimon A. Eugster2012-01-252-2/+28
| | | | | | | | | | | The resetModel() signal indicates that the model is reset. Previously there was no note that the signal is emitted also when endResetModel() is called. Task-number: QTBUG-23755 Change-Id: I6c3c1ccef580e9c1112c3af79912cffca675e140 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QKeySequence: fix copy/paste error in autotestDavid Faure2012-01-251-1/+1
| | | | | Change-Id: If03a99c9aa7210d3f166c2674831c645f67b1794 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Remove Q_COMPILER_FINALOlivier Goffart2012-01-241-7/+1
| | | | | | | | | | | | | Merge it with Q_COMPILER_EXPLICIT_OVERRIDES No compiler will implement one and not the other, "overrideS" is a shortcut for the two features It was even wrongly not defined with clang Change-Id: I22dcffe6f0c96285c2b409a5ae9ce2f6f1652094 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add autotest for failing signal connection.Friedemann Kleint2012-01-241-0/+6
| | | | | Change-Id: Iaae93253fa6d1ca0798d05d69a7ab6d6ff8b60bc Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Re-enable 'make check' for tests/auto/widgetsBradley T. Hughes2012-01-241-1/+0
| | | | | | | | We want the autotests for the QtWidgets library to be run on Mac OS X as well. Change-Id: Ie731b802b64222c84116e2df82f536acf4971565 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Deprecate QAbstractItemModel::reset().Stephen Kelly2012-01-242-8/+10
| | | | | | | | | | | | | | | | | | | It is broken in most uses because it emits modelAboutToBeReset() after actually resetting the internal data instead of before. That is, usually it is used like this: myData.clear(); reset(); Which should be beginResetModel(); myData.clear(); endResetModel(); Change-Id: I7b00a1e40c4915930944340764074efc29faaf5a Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* add missing move* methods to QAbstractItemModelMark Brand2012-01-243-1/+150
| | | | | | | | | | | | | | The existence of QAbstractItemModel virtual methods moveRow, moveColumn, moveRows, and moveColumns is implied by the existence of beginMoveRows, endMoveRows, beginMoveColumns and endMoveColumns. However, these were not actually provided by QAbstractItemModel. With this change, subclasses can implement support for moving rows and columns following the same pattern as for insert* and remove*. Change-Id: Iad8b2223d4b9303abb6459c174a82ffed71a0fdf Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Move glyphMargin() to QFontEngineJiang Jiang2012-01-2417-45/+43
| | | | | | | | | | | | | glyphMargin() support for QTextureGlyphCache is implemented in respective font engines, thus this function is platform dependent. Before Qt 5 the code is guarded in macros like #ifdef Q_WS_MAC, now we should move them into QFontEngine and its subclasses. So far only Windows font engines support it. FreeType and Core Text based font engines all ignore it. Change-Id: Ia14016533d8fbfaacf848a7d3bc928f8197318f5 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Make mid() and midRef() properly return empty, non-null objectsGiuseppe D'Angelo2012-01-245-8/+21
| | | | | | | | | | | If we request a substring starting at the very end of the string, QString::mid should return an empty string, not a null string. For instance, QString("abc").mid(3, 0) used to return a null one, while this patch makes it return an empty one. The same thing applies to QString::midRef() and QByteArray::mid(). Change-Id: Ie9efd7a0622d429efd0fb682c19856c19e9469af Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Made window orientation API more flexible.Samuel Rødal2012-01-2419-139/+310
| | | | | | | | | | | | | | | Previously we only had QWindow::setOrientation() which was a hint about the orientation the window's contents were rendered in. However, it's necessary to separate between the orientation corresponding to the window buffer layout and orientation of the contents. A game for example might typically want to use a landscape buffer even on a portrait device. Thus, we replace QWindow::orientation() with QWindow::reportContentOrientationChange() and QWindow::requestWindowOrientation(). Change-Id: I1f07362192daf36c45519cb05b43ac352f1945b5 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* QMessageBox: Clean up some Q_WS_WIN code.Friedemann Kleint2012-01-241-16/+20
| | | | | | | | Enable 'Close' of system menu according to whether escape button is present. Change-Id: I305e4732f781dbe2d81c2503ee278ec33579acdb Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Import json support from playground/qtbinaryjsonLars Knoll2012-01-2427-1/+8193
| | | | | | | | | | | | | This imports the JSON support for Qt 5 from playground/qtbinaryjson. It adds a fast, fully compliant json parser, a convenient C++ API, conversion to and from QVariants and a binary format for JSON that is extremely fast to use together with the C++ API. Change-Id: If9e3a21a4241d388d0abaa446b6824f9cc6edb1c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Store the is-a QObject fact with the metatype declaration.Stephen Kelly2012-01-2411-9/+154
| | | | | | | | | | | | | | This is a source incompatible change for Q_DECLARE_METATYPE(T*), which now requires T to be fully defined. The consequences of this are: * Forward declared types can no longer be declared as a metatype. (though this is a very uncommon thing to do). There is a trivial workaround where necessary. Change-Id: Id74c40088b8c0b466fcd7c55abd616f69acc82c8 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* QKeySequence: add tests, fix handling of '+' as key or separator.David Faure2012-01-242-9/+47
| | | | | | Change-Id: I3c471dff9b46025aab762d36bb3a3adc64ced561 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Make QUrl always lowercase the scheme().David Faure2012-01-242-5/+6
| | | | | | | | | | | | URL schemes can only contain alphanumeric characters and all protocols specify that they are case-insensitive. So instead of doing case-insensitive comparison everywhere and then get it wrong sometimes, better to lower-case it here. Change-Id: I61f51a3f4c85b90af1586ebcf69608987fbe2ec3 Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove dependencies on removed "TEXTSTREAM" option (f65a10b733)David Faure2012-01-241-3/+3
| | | | | | Change-Id: If7d6ca7af8eb305bd127776a35223d50c1fb4f04 Reviewed-by: Tasuku Suzuki <tasuku.suzuki@nokia.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* use QWinOverlappedIoNotifier in QWindowsPipeReaderJoerg Bornemann2012-01-242-91/+83
| | | | | Change-Id: I71d5feaa07e8febd6c562be1dc6d7790e3a1606c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QWinOverlappedIoNotifier introducedJoerg Bornemann2012-01-246-1/+556
| | | | | | | | | | | For asynchronous (overlapped) I/O notification on Windows one can now use the convenience class QWinOverlappedIoNotifier. It's using one global I/O completion port and a watching thread to get notified when a read or write operation completes. Change-Id: If6f904b364be0405580c7e50355529ab136ae3cb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Changed qnetworkdiskcache unittest to cleanup test directory.Kurt Korbatits2012-01-241-0/+3
| | | | | | | | | - Remove foo directory tree after run. Change-Id: I2d554b4c64fc7162c7717c840534cf77f5e744d0 Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Changed qtextdocument, qtextdocumentlayout unittests to cleanup tmp files.Kurt Korbatits2012-01-242-1/+15
| | | | | | | | | | - qtextdocument unittest to remove foo.png after test. - qtextdocumentlayout unittest to remove expected.png and img.png after test. Change-Id: I42971e9128d399cadc87b9fd345c868065f180a9 Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Changed painting unittests to remove created files after run.Kurt Korbatits2012-01-243-1/+41
| | | | | | | | | | | - qpainter cleans up temp files dest.png, expected.png and foo.png - qpainterpath clean up temp file data - qprinter cleans up silly, out1.ps, out2.ps, test.pdf and file.pdf Change-Id: Id434bea0bae5b970355206a250456e4beeca8060 Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Changed qpixmap unittest to remove created file after run.Kurt Korbatits2012-01-241-0/+6
| | | | | | | | | - Removes temp_image.png after test run. Change-Id: I0b233609c2bbf57151cf173181a40738d934f0ec Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Changed qxmlstream unittest to remove its created file after run.Kurt Korbatits2012-01-241-0/+6
| | | | | | | | | - Removes test.xml after test completed. Change-Id: I548e2d644cca8ae0d30c3002df45cf57433170af Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Changed qdatastream unittest to remove the test file it creates.Kurt Korbatits2012-01-241-0/+1
| | | | | | | | | - Remove datastream.tmp file after test completed. Change-Id: I844600f0a477397d129fd01ac755183c2d874da4 Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>