summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move QPlatformInputContextPlugin/Factory to QtGuiWeng Xuetian2012-06-289-11/+8
| | | | | | | | | | | | | PlatformSupport is no longer shared and there should be no plugin factory in it otherwise it will break plugin loading. Since PlatformInputContext is already in QtGui, so move QPlatformInput- ContextPlugin/Factory to resolve the platforminputcontexts plugin loading problem. And remove platformsupport-private dependency from existing inputcontexts plugin. Change-Id: If4cb766470b8f9c8b72157da86cb33b4e1ff09e3 Reviewed-by: Pekka Vuorela <pekka.ta.vuorela@nokia.com>
* Set window's surface format to support alpha channel.Gatis Paeglis2012-06-282-1/+4
| | | | | | Task-number: QTBUG-26114 Change-Id: I33f191373327832fb9d3054366412ec5be855cff Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Move the QDataStream operator<< for QPair to qdatastream.hThiago Macieira2012-06-2810-18/+27
| | | | | | | | | | QPair is small and is no problem to include from qdatastream.h. However, including QDataStream from qpair.h means including QIODevice and QObject too. Change-Id: I344321e9f68438008ec329a165135c3a346c6058 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Clean up the use of QT_NODLLThiago Macieira2012-06-288-10/+6
| | | | | | | | | | QT_NODLL is replaced by QT_STATIC, but the latter is implied if QT_BOOTSTRAPPED is already defined. Therefore, simply remove the QT_NODLL definitions. Change-Id: Iac7ec0b494b7a78197c25d59547f45eaf92d7465 Reviewed-by: Mark Brand <mabrand@mabrand.nl> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Update the macros for shared/DLL and static buildsThiago Macieira2012-06-289-121/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Up until now, we had a mess of different macros used for building DLLs, for building shared libraries on Unix systems and for building static libraries. Some of the macros were contradictory and did not work. From now on, there shall be only: - QT_STATIC: indicates that it's a static Qt build and the export macros should expand to empty - QT_SHARED: indicates that it's a shared / dynamic Qt build and the export macros should expand to Q_DECL_EXPORT or Q_DECL_IMPORT, depending on whether the macro corresponds to the current module being built (the QT_BUILD_XXXX_LIB macro comes from the module's .pro file) QT_BOOTSTRAPPED implies QT_STATIC since the bootstrapped tools link statically to some source code. QT_STATIC is recorded in qconfig.h by configure when Qt is configured for static builds. Nothing is recorded for a shared / dynamic build, so QT_SHARED is implied if nothing is defined. This allows for the existence of a static_and_shared build: with nothing recorded, defining QT_STATIC before qglobal.h causes the export macros to be that of the static form. Linking to the static libraries is out of the scope of this change (something for the buildsystem and linker to figure out). From this commit on, the proper way of declaring the export macros for a module called QtFoo is: #ifndef QT_STATIC # ifdef QT_BUILD_FOO_LIB # define Q_FOO_EXPORT Q_DECL_EXPORT # else # define Q_FOO_EXPORT Q_DECL_IMPORT # endif #else # define Q_FOO_EXPORT #endif The type of the Qt build is recorded in QT_CONFIG (in qconfig.pri) so all Qt modules build by default the same type of library. The keywords are "static" and "shared", used in both QT_CONFIG and CONFIG. The previous keyword of "staticlib" is deprecated and should not be used. Discussed-on: http://lists.qt-project.org/pipermail/development/2012-April/003172.html Change-Id: I127896607794795b681c98d08467efd8af49bcf3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Get started with patching up the Qt GUI docsGunnar Sletta2012-06-2875-217/+372
| | | | | | | | Primary goal, make the front page of the Qt GUI module a bit more clarifying and avoid downstream references inside the Qt GUI docs. Change-Id: Icbcfbb64b93963add889bf83711daa9575885c02 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Include QScopedPointer in qsettings.hThiago Macieira2012-06-281-0/+1
| | | | | | | | qobject.h includes it, but only if QT_NO_QOBJECT isn't defined. It is during the build of the bootstrapped tools. Change-Id: I8fc921fb17c283358af263a6932b763a21209d40 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* disabling largefile support for Win CEBjoern Breitmeyer2012-06-281-0/+1
| | | | | | | | | | this was disabled before but I2631ff687881278ba42edacd237a2130c103b69f enabled it per default Change-Id: Ic5a8e50d116cf6b15719668faf055967a6f34e06 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* doc: use correct snippet id for QObject::isSignalConnectedKent Hansen2012-06-281-1/+1
| | | | | | | Copy-and-paste error; the doc was based on QObject::receivers. Change-Id: I4f6ce716d388328e0345e8457cbc99fff323ce41 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* doc: remove duplicate linkKent Hansen2012-06-281-1/+1
| | | | | | | | | | Since QStateMachine inherits QState, QStateMachine::finished() and QState::finished() are the same thing. Task-number: QTBUG-14553 Change-Id: I7df2f815be377c19aeee393e9a2ce124183dc5e1 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* doc: add missing \sa tagKent Hansen2012-06-281-1/+1
| | | | | | Change-Id: I50580bfefdf556f116b7099946b047acd12d4563 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Removed flags from SSPI calls which prevented the NTLM authentication from ↵Adrian Carpenter2012-06-281-8/+2
| | | | | | | working Change-Id: I87b085442ef301d9d92def0608a8baaa330522e6 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fixed qsslsocket_onDemandCertificates_{static,member}Rohan McGovern2012-06-282-4/+2
| | | | | | | | | | | | | | | | | | | | This test had been XFAILing since August 2011, but recently started to XPASS, possibly due to changes in the SSL setup on the tested host (qt.nokia.com). Removed QEXPECT_FAIL and replaced qt.nokia.com with codereview.qt-project.org as a host expected to have working SSL. (If SSL on the latter were broken, it would immediately be detected by any attempts at git over HTTPS.) SSL setup can be verified as working by: openssl s_client -CApath /etc/ssl/certs \ -connect codereview.qt-project.org:443 </dev/null Task-number: QTBUG-20983 Change-Id: I9b4146da6545ab4115d6308044b1d242dd52b7f9 Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* Widgets: Apply masks to native windows only.Friedemann Kleint2012-06-271-10/+2
| | | | | | | | | | Do not go searching for a parent window handle in setMask_sys() as this causes for example MDI areas to set masks that show the child only. Fix breakage introduced by 8e280d1e187b09651c7036bd76272342d52ce401 . Change-Id: I57de41d16985ebc8d3fc81153a671f2e2807b1eb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* QNX: Add support for window statesThomas McGuire2012-06-272-1/+42
| | | | | | | | | Now QQuickView::showFullscreen() works as expected. QQuickView has no fallback for platforms without window state support, as opposed to QWidget. Change-Id: I9c41fe563ea1f6d117eaebd3ea1db87465142b85 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QNX: Flush after changing rotationThomas McGuire2012-06-271-0/+4
| | | | | | | | | This fixes a painting glitch where the window would stay in the old position with the old rotation until it got repainted. Change-Id: Id9de256b525760e8b32e55a87549efeccca151e0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
* Also use x11FilterEvent for auto repeat key in xcb.Weng Xuetian2012-06-271-8/+24
| | | | | | | | | filterEvent for QPlatformInputContext is already used for auto repeat key, x11FilterEvent also need to be filtered. Task-number: QTBUG-25795 Change-Id: I3db87fdffdb5b01404047e905793ae6e10bb1e90 Reviewed-by: Pekka Vuorela <pekka.ta.vuorela@nokia.com>
* Add const & to foreach 'iterators'Albert Astals Cid2012-06-2719-35/+35
| | | | | | | Change-Id: I8c0600dfd919f45d14a0011f2da9b9fe0b9a0df3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Document that the object of a plugin must be default-constructible.Stephen Kelly2012-06-272-0/+5
| | | | | Change-Id: Iaaf56ec3bb0d2423c8ab5deb0627dc1357cee830 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Refactor the creation of imported targets into a macro.Stephen Kelly2012-06-271-34/+26
| | | | | | | | | | | | | | | | | | | | | | | | | This will make it easier to handle cases where the Qt installation and the build do not match exactly. For example, on Windows, it would be possible to do: ./configure -debug make make install make release make release_install In which case, both debug and release libraries would be installed even though it was only configured with -debug. On non-Windows, the debug and release libraries would overwrite each other, so it is not necessary to support it. Similarly, we want to handle cases in the future where (on non-Windows) both static and shared libraries would be installed (again, not described with a single build configuration). Change-Id: Ib7916c9664a0f72e40156a03bdfc79a4a6c24350 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Remove .values() call in foreachAlbert Astals Cid2012-06-271-1/+1
| | | | | | | | foreach already knows how to iterate over the values without the need to create an intermediate qlist Change-Id: I4622a36fbdbf536a75f26b42e32488a77d078f02 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Remove deprecated method from new class.Thiago Macieira2012-06-271-3/+0
| | | | | | | | | I'm pretty sure I've caught all uses of deprecated methods throughout the Qt codebase, except for the ItemViews changes and for QtWebKit (which must still compile with Qt 4). Change-Id: Ic17801b71434fa41c647f97c9e5e4234ad4f9af0 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove the extra warnings and -Werror from tst_qmimetypeThiago Macieira2012-06-271-2/+0
| | | | | | | Those belong in headersclean and nowhere else. Change-Id: Ib7078ef3071266e4c03e3580068f978a9418cbf1 Reviewed-by: David Faure <faure@kde.org>
* Add QPA prefix and version number to QPA plugin factory interfaces.Friedemann Kleint2012-06-2713-13/+13
| | | | | | | The interfaces may change in Qt minor versions. Change-Id: I43bc6245ddbba8232e00313bdc64e8e60c7eab6f Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix raising and lowering native widgetsMiikka Heikkinen2012-06-271-2/+2
| | | | | | | | | Raising or lowering a native widget needs to raise or lower the associated platform window, too. Task-number: QTBUG-26344 Change-Id: Ib847d97df86857d92bcc4c9c0dd51219575d8db1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Add QGuiApplication::setApplicationDisplayName.David Faure2012-06-274-0/+45
| | | | | | | This is for use in window titles. Change-Id: I0070a08abd379ae2edcfab4413c182bd9e840678 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Add \since 5.0 to QDir::removeRecursivelyShane Kearns2012-06-271-0/+1
| | | | | Change-Id: I2392f26e666d5e01e71932f1afa48a65704f6d48 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Remove debug outputABBAPOH2012-06-272-68/+0
| | | | | | Change-Id: I07270211ee6f0439dc7249c8946795a68025828f Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: David Faure <faure@kde.org>
* Workaround to compile configureapp.cpp with MSVC2010 x64jian liang2012-06-271-1/+1
| | | | | | | | | Remove a non-ascii character from configureapp.cpp to let it to be compiled successfully with MSVC2010 x64. Change-Id: I0b016630be49e8731cc438abca4ef959124138be Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove all references to XLFD fontsLars Knoll2012-06-276-38/+10
| | | | | | | | XLFD fonts are no longer supported in Qt 5. Change-Id: I83400dab417c933d5cd956c0d168c45b9d79dab7 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* don't compile the host tools for wince already in configureOswald Buddenhagen2012-06-275-74/+3
| | | | | | | | qmake can now produce proper mixed-target projects Change-Id: I797f055f6e1487b9aefb75eee91d6c2cc4e6e56e Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Convert QPA menus to use QIcon, and enable icons.James Turner2012-06-274-6/+9
| | | | | | | | | Icon support was disabled in QPA menus, now QIcon is in QtGui, convert the QPA interface, enable setting the icon in QMenu, and make the Cocoa implementation use it. (And fix a ref-counting leak if an icon is actually set) Change-Id: Ica203bf6826b79d8beee58f39febc851b9633a66 Reviewed-by: Christoph Schleifenbaum <christoph.schleifenbaum@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Implement RFC6265 test suiteShane Kearns2012-06-272-0/+2056
| | | | | | | | | | | | | Tests against the test data from the IETF working group https://github.com/abarth/http-state The test data is in the parser.json file, imported from that repository and with one patch applied to make the ordering0001 test case data match the raw files which are used by their python test server. Task-number: QTBUG-18920 Change-Id: I17c1a8d92aef2850907f009667c6574e4c8d0cdb Reviewed-by: Richard J. Moore <rich@kde.org>
* QNetworkCookie - ignore unparsable expires attributeShane Kearns2012-06-271-4/+3
| | | | | | | | | | As required by RFC6265, if the date can't be parsed then the attribute should be ignored but not the whole cookie. Task-number: QTBUG-15794 Task-number: QTBUG-16798 Change-Id: I2ed2fbbaf2d00b194995349c24b174032a599703 Reviewed-by: Richard J. Moore <rich@kde.org>
* Ignore empty domain attribute in cookiesShane Kearns2012-06-271-9/+18
| | | | | | | | | As recommended by RFC6265. This fixes the optional-domain0042 test case. Task-number: QTBUG-15794 Change-Id: I6dd459797afcb52fa2a78437f8481f5abc6f3105 Reviewed-by: Richard J. Moore <rich@kde.org>
* Use RFC6265 rules for cookie path & path matchingShane Kearns2012-06-273-21/+50
| | | | | | | | | | | | | | | Url encoding of paths is no longer used. This matches the current release behaviour of Firefox, Chrome and MSIE browsers. RFC6265 does not allow this type of encoding. This fixes remaining path test cases in the IETF test suite. Currently the path0027 test is passed by Firefox but failed by Chrome and MSIE, so there is a potential compatibility issue. However it is a corner case with a malformed cookie. Task-number: QTBUG-15794 Change-Id: I9b02bb5adc32d614f512d314d06f2c60894aa2b0 Reviewed-by: Richard J. Moore <rich@kde.org>
* QNetworkCookie: Use RFC6265 rules for parsing Set-CookieShane Kearns2012-06-272-90/+25
| | | | | | | | | | | | | | The ';' separator takes priority even inside a quoted string. Quotation marks have no special meaning, they are not parsed and regenerated anymore. This means it is not possible to include the ';' character inside a cookie value. Other characters are returned transparently, including [",\] Task-number: QTBUG-15794 Task-number: QTBUG-26002 Task-number: QTBUG-11641 Change-Id: I4eefef5c6ac7753d5a21c226169e264578521fe9 Reviewed-by: Richard J. Moore <rich@kde.org>
* QNetworkCookie - use RFC6265 rules for max-ageShane Kearns2012-06-271-3/+9
| | | | | | | | | | | | | | | | If unparsable, ignore the max-age attribute but process the rest of the cookie normally. If max age <= 0, set expiration time to "earliest representable time" To keep this a safe value for conversions, time_t of 0 is used. This fixes cases 0019 and comma0005 in the test suite. Due to this change, cookies may be sent after they should have expired in case the max-age was malformed. Previously they would have been discarded immediately, which is more likely to break web services. Task-number: QTBUG-15794 Change-Id: I7882af8eb37db156785e4e358ca639e90c94f8d0 Reviewed-by: Richard J. Moore <rich@kde.org>
* QNetworkCookie - ignore unknown attributesShane Kearns2012-06-271-9/+1
| | | | | | | | | | | | RFC6265 clarifies that unknown cookie attributes should be ignored, including the version attribute which was defined by RFC2109 but not used correctly in practice. This fixes case 0008 in the test suite with minimal risk. Task-number: QTBUG-15794 Change-Id: I6f15e8e5e2e5f1ed168fc733a5c84d606a452252 Reviewed-by: Richard J. Moore <rich@kde.org>
* qget test - fix null pointer dereferenceShane Kearns2012-06-271-1/+1
| | | | | | | If the server sends a redirect with no body, the file is null Change-Id: I49fd1d8a4cdd404497ebef4c7f3b478960776896 Reviewed-by: Richard J. Moore <rich@kde.org>
* Change invalid test case (two cookies separated by ,)Shane Kearns2012-06-271-2/+9
| | | | | | | | Two cookies in a single Set-Cookie header are no longer allowed. Check that this header is parsed according to RFC6265 rules instead Change-Id: Ice48bbe78a9886208f7d1186cf1d8c37f46f1252 Reviewed-by: Richard J. Moore <rich@kde.org>
* QNetworkRequest autotest: adapt to new cookie parsing (re. commas)Peter Hartmann2012-06-271-1/+1
| | | | | | | | | | | | | | Cookies cannot be separated by commas anymore, but are separated by new lines. See "Remove support for multiple cookies in one Set-Cookie header to follow RFC6265." Reviewed-by: Martin Petersson Task-number: QTBUG-21456 (cherry-picked from 5d809703aa2d2a08ae7e9610fd42025b081d3d0c) Change-Id: If7d1b4e58399a5d678495af6ff280409ba220e86 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Remove support for multiple cookies in one Set-Cookie header to follow RFC6265.Jocelyn Turcotte2012-06-272-52/+20
| | | | | | | | | | | | This also allows cookie values to contain commas to increase compatibility like most popular browsers do even though the RFC still reserves them for future uses. Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> Task-number: QTBUG-21456 (cherry-picked from 8ba781b01e900148fec2e9d26485369b3295487f) Change-Id: Ib09ab2411dddf7f99de1c0c31680428b7412fc7e Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Add a method for querying window activation status from QPA.Morten Johan Sorvig2012-06-274-0/+22
| | | | | | | | | | Add QPlatformWindow::isActive(), where the platform can do further isActive tests, and Windows implementation for it. Change-Id: I1acfc44d3a4ab36a3aaee52fb7b5f5b40661095e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Fixed missing way of choosing EGL renderable type with QSurfaceFormat.Samuel Rødal2012-06-275-8/+77
| | | | | | | | | | | This has been long overdue, since EGL now lets you choose between desktop and ES based OpenGL. We also add OpenVG for those who want to use raw OpenVG with a QOpenGLContext. The underlying EGL API for using OpenGL / OpenVG is the same, with eglMakeCurrent() and eglSwapBuffers(). Change-Id: Ib0146b3fde5fe632069ebf99e7712f496ee7ea4d Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove some unused variables from QAccessibleWidgetPrivateJan-Arve Saether2012-06-262-72/+3
| | | | | Change-Id: I22fd67d63131d48356023c26eb0689587ce96967 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Fix QCOMPARE for QIcon in QtGuiGiuseppe D'Angelo2012-06-261-2/+0
| | | | | | | | | There's no need of QtWidgets for using QCOMPARE on two QIcons, as QIcon lives in QtGui. Change-Id: I40c3d4aeb15fb95876449383d9e2dd1ad39aa5f9 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Clarified documentation for QStandardItem::parent()Markku Heikkila2012-06-261-1/+3
| | | | | | | | Task-number: QTBUG-18785 Change-Id: I91ee8c3dc10c1484376a17e3f13794038d4a648f Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Add QAbstractDeclarativeData::isSignalConnected hookKent Hansen2012-06-262-6/+10
| | | | | | | | | | | | | | Similar to QAbstractDeclarative::receivers. This hook will allow QObject::isSignalConnected(QMetaMethod) to return true when there are QML-managed connections. It's important that the hook is called from QObjectPrivate::isSignalConnected(uint), since QML calls that function. Change-Id: I9c5e42f2b3e7f985af02905985a3a47101cdee05 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 10:15:59 +0000