summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
Commit message (Collapse)AuthorAgeFilesLines
* Implement QWindow::setWindowIconCorentin Jabot2012-05-245-19/+37
| | | | | | | | | | | Since QIcon has been moved back to QtGui, QWindow::setWindowIcon can use it. That way, the api is exactly the same as in QWidgets and one can deal properly with multi-sized icon. I added a getter so the api is consistent with QWidget (Maybe there should be properties for windowIcon and windowTitle) Change-Id: I2f463dbe39673f41a3201ef8fed27b3fcac2125f Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* QPA: Refactor QFileDialogPrivate::qt_clean_filter_list for QPASean Harmer2012-05-242-0/+17
| | | | | | | | | | Allows QFileDialog and QPA plugins to access this helper function. Needed by the Cocoa and QNX plugins. This commit fixes up the Cocoa plugin. The QNX support will be in a follow-up commit. Change-Id: I8dd08a9f3dc27d85edd0dc9dad9629406c1e677a Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Provide convenience method to resize maximized windowsKevin Ottens2012-05-242-0/+30
| | | | | | | | | | | Maximized/fullscreen windows geometry should follow screen geometry, so provide a convenience method implementing this behavior. It is meant to be used in platform plugins where the platform doesn't automatically resize said windows on screen geometry changes. Change-Id: Id9128fee1ddf587a7d96aa294d2d1e6eb6d6d11b Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
* remove exec-bit from qplatformmenu.h fileGirish Ramakrishnan2012-05-231-0/+0
| | | | | | | | | The file was added with 'x' bit incorrectly in 1f55af8. It was then changed to the correct mode in 6af65edcb. But it got back the 'x' bit again in 98dbaec. Change-Id: I55f267935c17e133ad593f027f795a9ec381fcaa Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Fix wrong local positions in mouse events when no tlw was givenLaszlo Agocs2012-05-232-8/+13
| | | | | | | | | | Calling handleMouseEvent() with w == 0 implies that the local position is bogus and instead it should be calculated from the global position once the target window is known. Change-Id: If173d0570f6dcc8b7bc5d6f21fa1f69d06d9d702 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* Minor QPlatformMenu API cleanup.Morten Johan Sorvig2012-05-233-188/+32
| | | | | | | | | | | | | | | | | | | | | | | | Make the QPlatformMenu* classes abstract with pure virtual functions. Delete qplatformmenu_qpa.cpp. QtGui no longer has to carry the empty implementations. Change the inheritance tree - Make QPlatformMenu and QPlatformMenuBar inherit QObject instead of QMenuItem. Add (now) missing virtual functions to QPlatformMenu. The effect of this change is to reduce the number of pure virtuals the platform has to implement. Change QPlatformMenuBar::syncMenu to take a QPlatformMenu pointer instead of a QPlatformMenuItem* pointer. Fix a couple of header/unused variable compiler warnings. Change-Id: I77450e40c6aae26f3e1aca204603acebd242c036 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Fix QtGui compilation for -qconfig largeTasuku Suzuki2012-05-236-0/+20
| | | | | Change-Id: I118a9b40c9eef821b326ee9dabbb9765d65277b7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qpa api: replace QPA headers with something more benignGirish Ramakrishnan2012-05-2218-85/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current 'we mean it' headers are considered too aggressive for QPA. Replaced using the following script. for file in `find -type f -name "qplatform*.h" -and -not -name "*_p.h"`; do LINE_NO_1=`grep -n -m 1 "W A R N I N G" $file | awk -F ':' '{print $1}'` LINE_NO_2=`grep -n -m 1 "We mean it." $file | awk -F ':' '{print $1}'` if [ -z "$LINE_NO_1" ]; then LINE_NO_1=`grep -n -m 1 "#define " $file | awk -F ':' '{print $1}'` LINE_NO_2=$((1+$LINE_NO_1)) else LINE_NO_1=$(($LINE_NO_1-2)) LINE_NO_2=$(($LINE_NO_2+2)) fi head -n $LINE_NO_1 $file > $file.new cat >> $file.new <<EOF // // W A R N I N G // ------------- // // This file is part of the QPA API and is not meant to be used // in applications. Usage of this API may make your code // source and binary incompatible with future versions of Qt. // EOF tail -n +$LINE_NO_2 $file >> $file.new mv $file.new $file done Change-Id: I8a974c9bf8942647b7ad950afb372c1f738aa725 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Add mouse event internal members needed by declarativeLaszlo Agocs2012-05-224-3/+35
| | | | | | | | | | | | In order to remove QQuickMouseEventEx we have to be able to store touch-related data, like capabilities and velocity, also in mouse events. However they should not be exposed through the public API in any way. (at least not in 5.0) Change-Id: I7774b9ea00074950208559463249fbdcaeeaefbf Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove a line of garbageLaszlo Agocs2012-05-211-3/+1
| | | | | Change-Id: Iae931b4a944abe29097dc30f97099e9aeaa9387c Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* QPA menu abstraction, originally based on Morten's workJames Turner2012-05-195-14/+297
| | | | | | | | | | Create a QPA abstraction for native menus, derived from the Cocoa support in 4.8, but with the expectation to support other platforms too. Update the QtWidget QMenu and QMenuBar code to maintain their QPA equivalents if they exist. Change-Id: Id605de3da8811dc832bf48b35f9107778ad320ff Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Move QIcon metatype handlers back to QtGuiOlivier Goffart2012-05-181-1/+15
| | | | | | | | | | | QIcon has been moved back from QWidget to QtGui, so the QIcon QVariant and QMetaType handler can now be moved back to QtGui. Also we can give back QIcon its old number, allowing to get rid of some compatibility hack when unstreaming QVariant Change-Id: I439d5c2987c06ecd619f394407850f678164afb8 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* QIcon: move back to QtGuiOlivier Goffart2012-05-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move the files and tests git mv src/widgets/kernel/qicon* qrc/gui/image/ git mv tests/auto/widgets/kernel/qicon/ tests/auto/gui/image/ - update the include of QIcon git grep -O"sed -i s,QtWidgets/qicon,QtGui/qicon," "QtWidgets/qicon" git grep -O"sed -i s,QtWidgets/QIcon,QtGui/QIcon," "QtWidgets/QIcon" - Adapt QIcon \ingroup documentation sed -i s/QtWidgets/QtGui/ src/gui/images/qicon* - Adapt export macro sed -i s/Q_WIDGETS_EXPORT/Q_GUI_EXPORT/g src/gui/image/qicon* - Update .pri and .pro files - Remove the use of QStyle::alignedRect by copying its content (and adapt slightly - Use QGuiApplication::palette() instead of QApplication::palette() - Add a hook in QGuiApplicationPrivate to call the QStyle::generatedIconPixmap() from QtWidgets Another commit follows to adjust QMetaType::Icon and move the QVariant and QMetaType icon handler back in QtGui Change-Id: I1b63759f892ebc02dfc30f41bb6e76e0b7451182 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Avoid qobject_castAaron Kennedy2012-05-181-1/+2
| | | | | | | | | This is slightly faster, and also avoids accessing the object's meta object that would cause any lazily created meta objects from being built. Change-Id: I0a78e09511c120bdbe707a1efc91ba480ab7680c Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Add focusWindowChanged signal to QGuiApplicationJames Turner2012-05-162-0/+10
| | | | | | | | Required for Cocoa platform menus support, we need a way to update state after focusWindow() result changes. Change-Id: Idc573888c3d75bcbff2252e243c4b57b15fc2fcd Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Fix QPA files inclusion headersGirish Ramakrishnan2012-05-156-18/+18
| | | | | | | find . -name "*.h" | xargs sed "s/^#\(.*\)_QPA_H/#\1_H/" -i Change-Id: Ifa96f8cfcb67070a961c7e5f05719b82653a1174 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Make QFileOpenEvents delivered again.Christoph Schleifenbaum2012-05-115-1/+29
| | | | | | | | Create a FileOpenEvent within QWindowSystemInterfacePrivate and handle it in QWindowSystemSystemInterface and QGuiApplication Change-Id: Ie777c923958d83d56e8648c9bfb1f9dcb985654d Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Doc: Fix \sa usageMarius Storm-Olsen2012-05-116-72/+73
| | | | | | | | | Ensure comma between elements (757 missing), single space and curly- braces around title elements, etc. Change-Id: Id16c3fda7fc47a12a0682f8720214f4990609a97 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Fix deprecation warnings in QtGui, QtPlatformSupport.Friedemann Kleint2012-05-101-1/+1
| | | | | Change-Id: I355a059c5311928301907d5d1e3ecce00a94341d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Merge "Merge branch 'docs-refactoring' into master" into refs/staging/masterMarius Storm-Olsen2012-05-107-38/+38
|\
| * Merge branch 'docs-refactoring' into masterMarius Storm-Olsen2012-05-107-38/+38
| |\ | | | | | | | | | Change-Id: Iebd1966abace3cdf7f9428dcfc1ded5b124ab113
| | * Doc: Move some remaining files over for modularization.Casper van Donderen2012-05-091-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | The files in this change were still in qtbase/doc/src or required for it. qtbase/doc/src should now only contain example documentation and images for the example documentation. Change-Id: Ia7ca8e7fd2b316e77c706a08df71303bc8294213 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| | * Doc: Modularize QtGui documentation.Casper van Donderen2012-05-097-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | This change moves the snippets and images to the modularized directories. Change-Id: I5f86f598fbe7c47d632c613b85d94ced89ba2c29 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | qpa: Remove QPlatformDialogHelper::deleteNativeDialog()Bradley T. Hughes2012-05-101-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function isn't really needed. The QDialogPrivate destructor deletes the platform helper, so the QDialog destructor does not need to do it. Subclasses of QPlatformDialogHelper are now responsible for deleting any native resources they create. The one place in QFileDialog that needs to recreate the native dialog can simply recreate the helper. QDialogPrivate::deleteNativeDialog() now becomes QDialogPrivate::deletePlatformHelper(), which resets all state to allow the platform helper to be recreated. Change-Id: I58adfe8801e02e63b3cb4a9a3a0b8cb5b3c7b161 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | | qpa: Clean up QPlatformDialogHelper APIBradley T. Hughes2012-05-101-15/+15
|/ / | | | | | | | | | | | | | | | | | | Remove the _sys suffix from all members of QPlatformDialogHelper and its subclasses. The QPlatform* class prefix already implies that these methods are system specific, we don't need the method suffix as well. Change-Id: I5ad1f928fab3a989992951acc244915e7fa48d32 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | QPA: Cleanup native dialog modal executionBradley T. Hughes2012-05-092-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the _q_platformRunNativeAppModalPanel() function, together with the launchNativeAppModalPanel() signal and emitLaunchNativeAppModalPanel() slot, which were previously used to run the modal loop inside the QDialog::exec() loop. This trick isn't necessary anymore, so remove the mechanism and code related to it. Rename QPlatformDialogHelper::platformNativeDialogModalHelp() to exec_sys(). This function is now responsible for both showing the native dialog and running the modal loop. QDialog:exec() now calls this function if a native dialog is in use (it does not call QEventLoop::exec() anymore). The dialogResultCode_sys() function was unused, so it has also been removed. This commit also removes some unused private slots that were left over from the port to QPA. Note that the comments in the Cocoa plugin are still valid and relevant, but this commit does not fix the scenarios mentioned. This will be done in a future commit. The Windows plugin needs minor changes. The QueuedConnections to accept() and reject() cause the deliver to come too late, resulting in crashes, hence the change to AutoConnection (which ends up being a DirectConnection). Change-Id: Ifc90325c945ca78737e60bf331929f03ecc52e0a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* | No longer use deprecated methods for plugin loading.Friedemann Kleint2012-05-093-43/+46
| | | | | | | | | | Change-Id: I19c66b1c41ea4dd236726c86d7d071b210ec9244 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | Remove qplatformdrag.h dependency in qguiapplication_p.hLars Knoll2012-05-092-2/+2
| | | | | | | | | | | | | | | | Including a qpa/ header here doesn't really work very well for other modules using qguiapplication_p.h. Change-Id: I7620b40bc4731d5a74fe11537637f376c578a786 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* | QPA: Add a themeHint for the animations.Friedemann Kleint2012-05-092-1/+17
| | | | | | | | | | | | | | | | | | | | | | Introduce a flag matching the Qt::UI_Effect enumeration and return it as hint. Replace the separate boolean flags in QApplication by a single integer using the flags. Change-Id: I29e33d4d23d13723ddb1b3f62fe781b9c0747572 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* | Added QScreen::refreshRate() to get the vertical refresh rate.Samuel Rødal2012-05-0810-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | To give applications that want it the option to use a fixed timestep for animations, and to avoid having values of 60 hard-coded (we have a couple of those in qtdeclarative/src/quick already), we need to know the refresh rates of the screens we are rendering to. Change-Id: Ife49162e830440ad7eab563a27e8aebbbafc5fc5 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | Add 'FullScreen' into QKeySequence::StandardKeystockton2012-05-082-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | This StandardKey was never defined in Qt4, and should be added to simplify cross-platform Shortcut handling for this Action. Comment concerning the sort-order requirement in QKeyBinding is expanded to discuss the role of Modifier Keys in the Sort Order. Task-number: QTBUG-25517 Change-Id: I8c26404010f1e55164e25fe6a586d9795869c25f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
* | Expose QPA API under qpa/*Girish Ramakrishnan2012-05-0756-91/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The main reasons for doing this are: 1. _qpa.h end up in the master QtGui include file. QtGui is meant for userland applications. qpa code is neither binary nor source compatible. Inadvertant use of QPA api makes the user code binary-incompatible. 2. syncqt creates forwarding headers for non-private header files. This gives people the impression that this is public API. As discussed on the mailing list, even though QPA api is internal and subject to change, it needs to treated differently from private headers since they will be used by in-qtbase and out-of-qtbase plugins. This commit does the following: 1. The _qpa in QPA header files is dropped. 2. syncqt now treats any file with qplatform prefix as a special file and moves it to qpa/ directory. The recommended way of using QPA API in plugins is: #include <qpa/qplatformfoo.h>. This allows the user include QPA API from multiple modules (for example, qplatformfoo might be in QtPrintSupport) 3. The user needs to explicitly add QT += <module>-private to get access to the qpa api. 4. Creates compat headers for the olden style qplatformfoo_qpa.h and QPlatformFoo includes. This commit does not change the cpp filenames. This requires a more careful merging of existing non qpa cpp files and existing cpp files on a case by case basis. This can be done at anytime. The following files are not renamed as part of this changed but will be fixed as part of a future change: src/gui/kernel/qgenericpluginfactory_qpa.h src/gui/kernel/qgenericplugin_qpa.h src/gui/kernel/qwindowsysteminterface_qpa.h files were renamed using for x in `find . -name "qplatform*_qpa.h"`; do git mv $x "${x/_qpa.h/.h}"; done for x in `find . -name "qplatform*_qpa_p.h"`; do git mv $x "${x/_qpa_p.h/_p.h}"; done includes were renamed using script for file in `find . -name "*.h" -or -name "*.cpp" -or -name "*.mm"`; do sed -i -e 's,.*#.*include.*<\(Qt.*/\)\?\(QPlatform.*\)>,#include <qpa/\L\2.h>,g' \ -e 's,.*#.*include.*"\(Qt.*/\)\?\(QPlatform.*\)",#include <qpa/\L\2.h>,g' \ -e 's,.*#.*include.* "\(qplatform.*\)_qpa.h",#include <qpa/\L\1.h>,g' \ -e 's,.*#.*include.*"\(qplatform.*\)_qpa_p.h",#include <qpa/\L\1_p.h>,g' \ -e 's,.*#.*include.*<\(Qt.*/\|Qt.*/private/\|private/\)\?\(qplatform.*\)_qpa\(.*\)>,#include <qpa/\2\3>,g' \ -e 's,.*#.*include.*"\(Qt.*/\|Qt.*/private/\|private/\)\?\(qplatform.*\)_qpa\(.*\)",#include <qpa/\2\3>,g' \ $file done Change-Id: I04a350314a45746e3911f54b3b21ad03315afb67 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* | Added clarification to platform screen documentation.Samuel Rødal2012-05-071-2/+2
|/ | | | | | | Document that physicalSize() should return the size in millimeters. Change-Id: Idf1283aa9b303bcb95361688f2ef663979bc6516 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Implement QWindow::resize(int, int) by calling to resize(QSize).Friedemann Kleint2012-05-041-1/+1
| | | | | | | | | The old implementation called setGeometry() clearing the positioning policy flag. Change-Id: If8226f86481318e772fba37c2c195037c3d955b0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Allow the QPA plugin arguments to contain non-ASCII.Thiago Macieira2012-05-041-1/+1
| | | | | | | Who knows what we might need them for in the future? Change-Id: Ic68e04aea6cb26afb0ed98684bbb37a62c111638 Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.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>
* Merge remote-tracking branch 'origin/api_changes'Lars Knoll2012-05-038-189/+49
|\ | | | | | | | | | | | | | | | | | | | | | | 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
| * 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>
| * 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>
| * Remove QVariant constructor taking Qt::GlobalColor.Jędrzej Nowacki2012-04-191-9/+0
| | | | | | | | | | | | | | | | 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-182-11/+0
| | | | | | | | | | | | | | | | | | | | | | 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>
| * Hide QTypeModuleInfo in a private namespace.Jędrzej Nowacki2012-04-181-1/+1
| | | | | | | | | | | | | | The class is private and shouldn't pollute global namespace. Change-Id: Ib44473fd72e5a70096eeff1662e88b29263d19c6 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* | fix documentation for QKeySequence::StandardKey "What's This"stockton2012-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | add apostrophe and double-quotes. Task-number: QTBUG-25545 Change-Id: Ib79953731953166ff7d8b999fee6571e62d86d01 Reviewed-by: Rick Stockton <rickstockton@reno-computerhelp.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | Fix compilation of public headers with QT_NO_DEPRECATED definedOlivier Goffart2012-05-027-19/+21
| | | | | | | | | | | | | | | | | | | | Put the functions in QT_DEPRECATED_SINCE if possible QPluginLoader::staticInstances is not documented as deprecated, and do not reference any alternative use. So I unmarked it as deprecated. Change-Id: I556c3f3657fb0490dd5543fcc56718fe9bd394e7 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* | Support all modality types in QPlatformDialogHelperBradley T. Hughes2012-04-301-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modality is not a boolean property in Qt. There are 2 types: window modality and application modality. Native dialogs can support both of these types as well (e.g. on Cocoa, a window modal file dialog should be displayed as a Sheet). Remove the QPlatformDialogHelper::ShowFlags enum and instead pass a Qt::WindowModality parameter to QPlatformDialogHelper::show_sys(). The Windows implementation has been updated to check for Qt::ApplicationModal instead of the ShowModal flag (since only Qt::ApplicationModal dialogs are blocking). The Cocoa implementation has been updated to only use non-modal and application modal native color and font dialogs (which restores Qt 4 behavior). These are shared Cocoa panels that cannot be shown as sheets, however. If the programmer asks for window modal color/font dialogs, we use the Qt versions, not the native ones. The file dialog can be shown either as a Sheet (but we need to pass an NSWindow parent for it to work properly) or as an application modal dialog. This change has been tested on Mac OS X with tests/manual/windowmodality. Change-Id: I9064987433895c55f68aac979ef8e8207fb24bbe Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@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>
* | 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>
* | Replace QGuiApplication::activeWindow by focusWindow().Friedemann Kleint2012-04-272-2/+2
| | | | | | | | | | | | | | Fix deprecation warnings. Change-Id: I8d33aa8c035df6f5ef3fff6a402e980e43e03406 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 21:10:13 +0000