summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Allow the QPA plugin arguments to contain non-ASCII.Thiago Macieira2012-05-042-2/+2
| | | | | | | Who knows what we might need them for in the future? Change-Id: Ic68e04aea6cb26afb0ed98684bbb37a62c111638 Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* Use QFile::encodeName to encode a file name on UnixThiago Macieira2012-05-042-2/+2
| | | | | | | This usually matches QString::toLocal8Bit, not toAscii. Change-Id: I7b1c3e500be8265de0710cf36ca407c8b3f31edd Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Fix QUrl::toString(StripTrailingSlash) to not turn file:/// into file:David Faure2012-05-042-11/+19
| | | | | | | | It should only strip one slash (as the name indicates), and not if the path is just "/". Change-Id: I133a81977241de77a49d1d1559143d30e0bd52f8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add setCursor API to QWindowLaszlo Agocs2012-05-043-0/+81
| | | | | | Change-Id: Id430ea9c94475356c9367a135f678f5f9ef795fc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix compiler warningOlivier Goffart2012-05-041-3/+2
| | | | | | | | qurlrecode.cpp:481:24: warning: ‘action’ may be used uninitialized in this function [-Wmaybe-uninitialized] Change-Id: I638b65218d1875667e2c60a5720ecda87202b82f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Always return uiLanguages in bcp47 formatLars Knoll2012-05-041-20/+18
| | | | | | | | | | | | | | The old code didn't convert the uilanguages coming from the system locale to bcp47 format, leading to QLocale().uiLanguages() and QLocale("en_US").uiLanguages() returning things in an inconsistent format. Now it always returns bcp47 format (ie. Language and Country separated by a hyphen). Change-Id: I40d3442255e6e8daa4723f7b3fc13829c9764eb1 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
* Remove insignification from tst_QOpenGLMiikka Heikkinen2012-05-041-2/+0
| | | | | | | | This test is passing for Windows now in CI due to recent fixes, so remove the insignification. Change-Id: Ib74aea443c4a66c9bf743d88e15d9f27f9ac2fe4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Port the QTextStream / QDebug functions away from fromAsciiThiago Macieira2012-05-042-3/+3
| | | | | | | | | No behaviour change since fromAscii (temporarily, at this point) means fromUtf8. Change-Id: I0e4d3ccfac7b5beaaaececb9f088324ee4838f84 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Change remaining uses of {to,from}Ascii to {to,from}Latin1 [other]Thiago Macieira2012-05-043-17/+17
| | | | | | | | | | This operation should be a no-op anyway, since at this point in time, the fromAscii and toAscii functions simply call their fromLatin1 and toLatin1 counterparts. Task-number: QTBUG-21872 Change-Id: Ib1eaf42679ab5db4005192c3d00ba79e43edfcca Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Don't flush WA_DontShowOnScreen widgets.Morten Johan Sorvig2012-05-041-0/+4
| | | | | | | | | QBackingStore::flush expects that windows have gotten expose events before flush is called. Not on screen -> no expose events -> don't call flush. Change-Id: Id868888566fe672939f3c5775f9f371fb3240ee8 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QPA plugins]Thiago Macieira2012-05-045-6/+6
| | | | | | | | | | | This operation should be a no-op anyway, since at this point in time, the fromAscii and toAscii functions simply call their fromLatin1 and toLatin1 counterparts. Task-number: QTBUG-21872 Change-Id: I4aef078ea87ecd3699de107d1e9352d9fb6d6e39 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtTest]Thiago Macieira2012-05-042-3/+3
| | | | | | | | | | This operation should be a no-op anyway, since at this point in time, the fromAscii and toAscii functions simply call their fromLatin1 and toLatin1 counterparts. Task-number: QTBUG-21872 Change-Id: I6f3fa6a06ed037f3a98387958ba7ab18c3e04977 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtOpenGL]Thiago Macieira2012-05-043-7/+7
| | | | | | | | | | This operation should be a no-op anyway, since at this point in time, the fromAscii and toAscii functions simply call their fromLatin1 and toLatin1 counterparts. Task-number: QTBUG-21872 Change-Id: I6ea46cd6dfed75afc253fa2b4e3f1789bdad1d4e Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtNetwork]Thiago Macieira2012-05-0410-44/+44
| | | | | | | | | | | | This operation should be a no-op anyway, since at this point in time, the fromAscii and toAscii functions simply call their fromLatin1 and toLatin1 counterparts. Task-number: QTBUG-21872 Change-Id: I94cc301ea75cc689bcb6e2d417120cf14e36808d Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Richard J. Moore <rich@kde.org>
* Change QString::toAscii to toUtf8 in the embedded filename in XBM.Thiago Macieira2012-05-041-3/+3
| | | | | Change-Id: Iea32f30ac71b35c2792e2523400811fa54c804dc Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtGui]Thiago Macieira2012-05-049-40/+40
| | | | | | | | | | This operation should be a no-op anyway, since at this point in time, the fromAscii and toAscii functions simply call their fromLatin1 and toLatin1 counterparts. Task-number: QTBUG-21872 Change-Id: I2850033159508ebb1ff7564e15b99a146dbee94c Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtCore]Thiago Macieira2012-05-0417-39/+39
| | | | | | | | | | | This operation should be a no-op anyway, since at this point in time, the fromAscii and toAscii functions simply call their fromLatin1 and toLatin1 counterparts. Task-number: QTBUG-21872 Change-Id: I38f97ad379deafebef02c75d611343ca15640c8a Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Make the event notification on Windows be mandatory in all dispatchersThiago Macieira2012-05-046-5/+36
| | | | | | | | | | | | | This way, QWinEventNotifier will work on all Windows systems, not just with the default event dispatcher. Other dispatchers (other than QWin32EventDispatcher) are permitted, so the class should not abort just because of that. If a dispatcher really doesn't want to implement this, they need to implement the virtuals to do nothing, possibly print a warning. Change-Id: I2c132bcde95b9d5941c8906a0fcd2ad964087772 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Windows 7 - fix nativewifi bearer pluginShane Kearns2012-05-042-7/+21
| | | | | | | | | | The plugin code only handled the 2 events from windows XP, while there are more events defined on vista/7. As the scan complete event was being ignored, updates did not complete. Task-number: QTBUG-24503 Change-Id: Ib1fd6883b0fd6962f61dab7830e577b9292163ef Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* Pass network session to http delegateShane Kearns2012-05-041-0/+3
| | | | | | | | This functionality was in Qt4, and apparently lost in the QNetworkAccessHttpBackend -> QNetworkReplyHttpImpl change Change-Id: Ia354cfd2c10808a6543173ec017d911f1696e7fb Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* Windows: Fix Vista style for use with QProxyStyle.Friedemann Kleint2012-05-043-3/+17
| | | | | | | | | | | Cleanup the treeview helper window in case XP style cleans the handle map. This fixes the drawing of the PE_IndicatorBranch primitives in Qt Creator. Task-number: QTBUG-25395 Change-Id: Iba561709e3d4032a59690c7b9163fb69bfa98619 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Add mkspecs for 32-bit Mac OS X builds.Morten Johan Sorvig2012-05-0410-5/+215
| | | | | | | | | | | | | | | | Add mkspecs/macx-clang-32 Add mkspecs/macx-g++-32 Add mkspecs/common/clang-mac.conf Skip the rest of the Mac mkspecs (icc, llvm, g++40, g++42, builder, Xcode, xlc) pending a cleanup where we determine which ones to keep. Change-Id: I00ceddfcbdb5119cb132433bad43e4aed016eab2 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Compile.Morten Johan Sorvig2012-05-041-2/+2
| | | | | | | | | | Clang is picky about the missing QT_FASTCALL and cant't find the base fetchPixel/storePixel template function. Change-Id: I7c0c14835b3d428f8f95961dc603d809511d7165 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Remove "file qmake"-based arch detection.Morten Johan Sorvig2012-05-041-24/+0
| | | | | | | Change-Id: I0b6b66eb439c7f0f566b74cc3da0726a5ecbac34 Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove all usages of "arch" CFLAGS on Mac.Morten Johan Sorvig2012-05-048-63/+0
| | | | | | | | | | | | | Remove all [PPC|PPC64|X86|x86_64] CFLAGS, CXXFLAGS and OBJECTIVE_CFLAGS. Delete the arch prf files. 32/64 bit arch selection will be made using a different mechanism in Qt 5. Universal builds are not supported. Change-Id: I4664f2c31801cec7fb4d240f41c2c5204a109020 Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Make cupsTempFile member unconditianol.Christoph Schleifenbaum2012-05-041-2/+0
| | | | | | | | | | | | QPdfEngine has to have the same member everywhere. Otherwise QPdfEngine and QPdfPrintEngine are compiled with different flags (-DQT_NO_CUPS) -> QString cupsTempFile is only in QPdfEnginePrivate in one lib -> crash. Task-number: QTBUG-25553 Change-Id: I1d23bd14b8e68c212225ac773675a3b1bd2ca6cb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Rename QAbstractSocket::PauseOnNotify -> PauseOnSslErrorsShane Kearns2012-05-045-8/+8
| | | | | | | | | | | | | | | Although we created an enum for pause modes to make 5.x binary compatible with 5.0, the enum value is not well named. In 5.1, we propose to add PauseOnProxyAuthentication to the enum. PauseOnNotify is not clear what it means, while PauseOnSslErrors is. Any new notification in a minor release would need a new enum value otherwise applications would get pauses they did not expect. Task-number: QTBUG-19032 Change-Id: I4dbb7467663b37ca7f0551d24a31bc013968bedc Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix windows cert fetcher if site presents full chainShane Kearns2012-05-041-1/+3
| | | | | | | | | | | | | | | | | If a website presents the complete certificate chain in the handshake i.e. site -> intermediate CA -> root CA then openssl gives a different error (SelfSignedCertificateInChain) Because of this windows feature, that either means the site is signed by an untrusted CA, or the CA trust status is unknown because we don't have the root cert in the cert store. In any case, calling the windows verification function results in a trusted chain & the root being added to the cert store. Task-number: QTBUG-24827 Change-Id: I2663ea2f86cd0b4dfde105d858ec1b39a340c1f6 Reviewed-by: Richard J. Moore <rich@kde.org>
* Move QSocketNotifier data members to a private classShane Kearns2012-05-042-29/+43
| | | | | | | | This is a binary incompatible change to allow future changes to QSocketNotifier to be possible in a binary compatible way. Change-Id: If90f3393e84edd3b1ac4d4132fa8e59b6b87a8ec Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Document new APIs in 5.0Shane Kearns2012-05-038-0/+30
| | | | | | | | The \since 5.0 directive was missing from many places. Task-number: QTBUG-24001 Change-Id: I191ba8891ae66d78f923164bcab2fccb16eabef9 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Document deprecated APIs in QSslShane Kearns2012-05-031-0/+10
| | | | | | | Task-number: QTBUG-24001 Change-Id: I8d0980bd5418e9324d0a0fe55c00b432c0a98fb1 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Document QSslCertificate deprecated functionsShane Kearns2012-05-031-4/+16
| | | | | | | | With the new functions linked Task-number: QTBUG-24001 Change-Id: I9fd2de746a6342a1f4f182189e7f2529f092c003 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Remove some remnants of Symbian code in src/gui/paintingThiago Macieira2012-05-031-9/+1
| | | | | | | | | Those files don't exist anymore. They were removed in d1a2b53aaf76f48e195260a415ca406fa1ef01a2. Change-Id: Id20203c5671eec8bff74fb76b8baf6b2fecb7c5b Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Revert "[SIC] Make non-const the QRegExp methods that modify the internals"Thiago Macieira2012-05-033-13/+18
| | | | | | | | | | | | This reverts commit 75a0c7f9b52cde47f20fdc1b89e1264d60350848. The source-incompatible change proved to be more trouble than it's worth. Too much intrusion into the porting effort of applications for no appreciable gain, especially considering that we have a replacement class. Change-Id: Ia99a2360390a2062a8ddb6e12c8f2099287a2704 Discussed-on: http://lists.qt-project.org/pipermail/development/2012-May/003562.html Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* troll.no changed its NS record configuration. Adapt.Thiago Macieira2012-05-031-1/+1
| | | | | | Change-Id: I62d778da67a463da765b6ad70774449560105d7d Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fix tabs/whitespacesYuchen Deng2012-05-031-9/+7
| | | | | Change-Id: I4db24b703c69ce99f529c84248d9fe4a19a60a03 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Merge "Merge remote-tracking branch 'origin/api_changes'" into ↵Lars Knoll2012-05-0339-571/+719
|\ | | | | | | refs/staging/master
| * Merge remote-tracking branch 'origin/api_changes'Lars Knoll2012-05-0339-571/+719
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qlogging.cpp src/gui/kernel/qguiapplication.h src/gui/kernel/qwindow.cpp src/gui/kernel/qwindow.h tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp Change-Id: I62a8805577a7940d4d36bed985eb3e7019d22f2e
| | * Allow qDebug output to be configured by qSetMessagePattern()Kai Koehne2012-04-245-17/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add qSetMessagePattern() to configure the default message pattern. This one can still be overwritten by setting the QT_MESSAGE_PATTERN environment variable. Without this method, there's actually no way to change the default output programatically. Since QT_MESSAGE_PATTERN is evaluated when the first message arrives, setting it via e.g. qputenv might have no effect/be too late. Change-Id: I115e0c30606f128fdbf5c169a951ffa2a6a48517 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Migrate QString over to QArrayDataJoão Abecasis2012-04-242-82/+32
| | | | | | | | | | | | | | | | | | Change-Id: Ieadc60523a2bef61a088920576c65c720b11bfb9 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Move QGestureEventPrivate's content to the main classThiago Macieira2012-04-235-49/+20
| | | | | | | | | | | | | | | | | | | | | QEvent now checks that the d pointer is unused. Change-Id: Ib0aa97d1692ea55324c4c6f133ffdd5a221f1680 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| | * Make QStringLiteral and QByteArrayLiteral always return the real typesThiago Macieira2012-04-234-73/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Up until now, the macros would return an internal type that contained the pointer to the data. This breaks code that tried to use the macros with operators, like QStringBuilder but also when writing: QStringList() << QStringLiteral("a") << QStringLiteral("b"); This change seems to work fine now and I can also verify that this works: const auto str = QStringLiteral("Hello"); Even though it creates a QString, which is non-POD and non-constexpr. Change-Id: Iaf82af9bea4245513a1128ea54f9d2d3d785fb09 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
| | * Add unit testing for the qdbusxml2cpp toolThiago Macieira2012-04-213-1/+269
| | | | | | | | | | | | | | | | | | | | | | | | I have not added tests for warnings or other failure to input. This tests only proper output for the moment. Change-Id: Ie01fd2a78adfa57c27bf288a08cd44ae82f51241 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
| | * Stop using QEventPrivate::d in QWindowStateChangeEventThiago Macieira2012-04-202-13/+4
| | | | | | | | | | | | | | | | | | | | | | | | We can add a boolean and avoid using the d pointer (which QEvent now checks to be unused). Change-Id: I7367d5410d10ed06441fe9037cac0e3473d62498 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| | * Logging: Change arguments of message handler to avoid conversionsKai Koehne2012-04-208-94/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a new QtMessageHandler that takes QString instead of char *: This avoids converting to local8bit , only to convert it back to utf16 for Windows. The old QMessageHandler is kept for a transition period, but will be removed before Qt 5.0. Also fix qEmergencyOut (that is called in OOM situations) to not rely on the default message handler. Change-Id: Iee0ce5838f97175c98788b847964273dd22d4a37 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Remove private classes in QEvent-derived classes.Thiago Macieira2012-04-193-150/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QEventPrivate doesn't exist, so these classes were technically abusing the d pointer. Move the contents of the private classes into the main event classes. Change-Id: If2e894c1fa05f468221a0b43f3ebdf90769298eb Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| | * Add an assertion to deleteLater() before it modifies QEvent::dThiago Macieira2012-04-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The deferred deletion functionality stores the event loop level nesting count in the QEvent d pointer. In Qt 4, this d pointer was not usable because we forgot to add a proper copy constructor and assignment operator to it, so the deleteLater() process stored the count here safely. Since Qt 5 now has non-implicit copy methods, the d pointer could be used in the future. If QEvent uses it, this assertion will trigger. Note that it doesn't apply to classes derived from QEvent, though. Change-Id: I8600c8e9379921e32aca166bc0a6c0b4c4ed799f Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
| | * Remove QVariant constructor taking Qt::GlobalColor.Jędrzej Nowacki2012-04-196-34/+7
| | | | | | | | | | | | | | | | | | | | | | | | The constructor is wrong, it creates instance of QVariant encapsulating a QColor instance. QVariant should not implicitly convert data, never. Change-Id: Idc794ecdecb42d8b53fee3f993bf51ddd43f595d Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| | * api: remove QWindow::visible()Girish Ramakrishnan2012-04-183-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The correct api is QWindow::isVisible(). Removing the api is safe since QWindow is not even released yet. Only qtdeclarative needed to be fixed with 71c8fe296fe5aa7e79033dd8f5b539852d4276e0. Change-Id: Ie571ed4802fe89132419e402acdb854446f4578f Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * api: QGuiApplication::inputMethod should be staticGirish Ramakrishnan2012-04-182-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Pretty much all methods in QGuiApplication are static. Also adds documentation. Change-Id: I96808dd266922432b92fe3962292e4d5b6a8ab46 Reviewed-by: Pekka Vuorela <pekka.ta.vuorela@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 02:57:58 +0000