summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* remove obsolete qudevhelper and adopt mouse and touch pluginsJohannes Zellner2012-03-1411-135/+251
| | | | | | | | | | | | The QUDevHelper class is now replaced by QUDeviceHelper class. All evdev input plugins are using the new udev helper now to enable hotplugin for keyboard and mouse input. EvdevTouch plugin still only uses the first detected device by udev, this cannot be tested on my side, due to the lack of multiple touch input devices. Change-Id: I01a4cfe1a80000bfb27c67a2f53faf560906b73c Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Uncomment disabled code in QResourceEngine autotest.Jason McDonald2012-03-141-1/+1
| | | | | | | Resource files are expected to be readable. Change-Id: Ife2b624e69b58e2fb996bc3e210a6e6c5c6852fe Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Tidy the QSettings autotest.Jason McDonald2012-03-141-86/+62
| | | | | | | | | | | - remove unnecessary includes - remove undefined private functions - remove commented-out test function - fix indentation - clarify why part of tst_QSettings::setValue() is commented-out Change-Id: I09e1a33896536e702f7ba65f266415536b4f9e0b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove commented code from qtconcurrentmap autotest.Jason McDonald2012-03-141-9/+0
| | | | | | | | | The removed code was already commented out when the test was added to the Qt repository and does not compile when uncommented as it calls non-existant overloads of QtConcurrent::FunctionWrapper1::operator(). Change-Id: I5a02efae4b89e2815b077474aa7cd0192dcb2730 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Removed invalid assert in BMP loader code.Kim Motoyoshi Kalland2012-03-141-2/+0
| | | | | | | Task-number: QTBUG-24505 Change-Id: I2e369b6d92f072caadeda41125303856ddfabd48 Reviewed-by: aavit <qt_aavit@ovi.com>
* Fix a Typo in evdevkeyboard.proRick Stockton2012-03-140-0/+0
| | | | | | | | | bad was: /qevdevkeybaord_defaultmap.h good is: /qevdevkeyboard_defaultmap.h Change-Id: Ic29bf94df0012e7ed3f05c0f258198d1b561d99a Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com>
* Windows: Fix QSpinBox background setting via stylesheetMiikka Heikkinen2012-03-132-4/+8
| | | | | | | | | | | | | | | | When using stylesheets, palette mask for drawing the background of line edit child of spinbox is already correctly resolved to style options in QStyleSheetStyle::drawPrimitive(), so we cannot simply ignore that mask and check the palette mask of the parent spinbox. Fixed by using a union mask of the parent spinbox palette and the palette supplied by style option instead of simply using the mask from parent spinbox. If either specifies custom base color, use that to paint the background of the spinbox's line edit. Task-number: QTBUG-24323 Change-Id: I1e738192db83b16d9bd48da54d29779e18788ef7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* improve declaration scopeMark Brand2012-03-131-1/+1
| | | | | Change-Id: Id8d8f4e59793ba5fc2d3afa31674009af73a59c9 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* use QStringLiteralMark Brand2012-03-131-1/+1
| | | | | Change-Id: I0f2b6ff758524e872d38dcbdc9335264431e3dc6 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fix memory leak when sqlite3_open_v2 failsHonglei Zhang2012-03-131-0/+5
| | | | | | | | | | | | | | According to SQLite documentation, a database connection handle is usually returned, even if an error occurs. This behavior has caused Qt to leak memory when opening a database is failed. Now, even if sqlite3_open_v2() does not return SQLITE_OK, Qt tries to release SQLite database handle by calling sqlite3_close(). Task-number: QTBUG-15773 Change-Id: I6538e2897216828a9cfb95b7d4a5cec437aa6c28 Reviewed-by: Mark Brand <mabrand@mabrand.nl> Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Deliver events in qtestmouseLaszlo Agocs2012-03-131-6/+11
| | | | | | | | | | | | | Not waiting until the QPA event queue is processed after handleMouseEvent() is wrong. Unlike the synchronous sendEvent() calls these tests most likely utilized earlier, many of the QWindowSystemInterace functions are asynchronous in the sense that they just queue the event, delivery will happen when the event dispatcher on the main thread gets there. Change-Id: I8197d2dc4805cda684a8279ceb8d4b317f19aba7 Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Add support for IAccessible2 on WindowsJan-Arve Saether2012-03-13135-409/+42522
| | | | | Change-Id: Ia955ab46dc5037ed1c74e0acc525e98b02552c97 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* uic: Avoid creating multiline QStringLiterals for MSVC.Friedemann Kleint2012-03-131-10/+25
| | | | | | | The compiler complains about L"foo" "bar". Change-Id: I94be0528b26fe65413db56d210a5c02fcdba13a3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Print all accessibility event strings.Frederik Gladhorn2012-03-131-47/+1
| | | | | Change-Id: I2488fe86fb2c154a8b7d91c6e4f2cd9c9e7b9ecb Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Optimize HB memory consumption of PairPos1 in GPOS tablesEskil Abrahamsen Blomfeldt2012-03-132-28/+101
| | | | | | | | | | | | | This is pretty much the same fix as in be0dfa34737a014e7ad060a90c4c24be9998fe13 but for PairPos format 1 instead of 2. With very simple GPOS tables we would waste a lot of memory on caching an uncompressed table, so we now compress it in memory as well. Change-Id: I601331b4b83f636dab9e1ac403b343558c15b0de Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* qdoc3: qdoc now handles overloaded methods for QMLMartin Smith2012-03-138-15/+81
| | | | | | | | | | | | When a C++ class is documented as a QML type, it can have overloaded QML methods. These are now handled correctly by qdoc. The method list for QML types is now output with the full method signature. For signals and handlers too. Task-number: QTBUG-24670 Change-Id: If529d4136f5b480373b6ac25d2dceef15e6ea3db Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Update the footer for qdoc output for qt-project.Casper van Donderen2012-03-132-27/+31
| | | | | Change-Id: I418ac4e754aac96220d14948ce066c982c4b8054 Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Remove -arch argument and #define QT_ARCH from configuresBradley T. Hughes2012-03-139-239/+297
| | | | | | | | | | | | | | | | | | | | | | | | | | Do not try to detect the host or target architectures using uname or similar, and do not override with the -arch or -host-arch configure arguments. The configures will still accept the -arch and -host-arch arguments, but it ignores them and instead outputs a warning stating that these arguments are obsolete and should not be used. Set QT_ARCH and QT_HOST_ARCH qconfig.pri variables based on the compiler target. This is done by running qmake (twice when cross-compiling) on config.tests/arch/arch.pro, which preprocesses a file that contains all knowns processors. On Windows, configure.exe has never run any config.tests before, and does not currently have a function to run a program and capture its output. Use _popen() to accomplish this (as qmake does for its system() function). This needs to be done after qmake is built, as does the mkspecs/qconfig.pri generation. As a side effect, the configure steps have been slightly re-ordered, but the overall result is the same. The displayConfig() call is moved to just before generating Makefiles, so that it can show the detected architecture(s). Change-Id: I77666c77a93b48848f87648d08e79a42f721683f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Clean up test, check radio button and checkbox.Frederik Gladhorn2012-03-131-3/+8
| | | | | Change-Id: I4dcfa2014256aee10feb08146ae6fc3f402ac8fb Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Autotest details of QAccessibleEvent.Frederik Gladhorn2012-03-132-22/+40
| | | | | Change-Id: Ieec33c23e7b18cfedf061088d6561203a5e7ac39 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* QNam: only init channels when needed.Martin Petersson2012-03-133-47/+139
| | | | | | | | | Each channel will create a socket that will allocate memory for the read and write buffers. This change will instead initialize channels only when they are needed. Change-Id: I112b4c7b944a7dd345414f06260c92803394eaed Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fix icon suffixes in systray example.Friedemann Kleint2012-03-131-3/+3
| | | | | Change-Id: If464befa88f26a881557724b4fc175f0a82c90b6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* take opportunity to use constMark Brand2012-03-131-2/+2
| | | | | Change-Id: Ief12d4b55e1705c758dae8078cf52948fcd9565b Reviewed-by: Richard J. Moore <rich@kde.org>
* qdoc: Update to prepare to run on a directory.Casper van Donderen2012-03-132-22/+2
| | | | | | | | | | This change sets some default file extensions to accept to generate documentation. It also removes support for the sourceModules qdocconf variable which is not used anymore. It was used just after modularization. Change-Id: Iabdcfb534dc662bd44e0928036fd68ee4e460b07 Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Cocoa platform plugin: Add support for up to 16 mouse buttonsRick Stockton2012-03-131-2/+94
| | | | | | | | | | | | OS-X provides a buttonNumber within Event data for otherMouseDown: and otherMouseUp: Events. Instead of mapping all occurences of these event types to Qt::MiddleButton, this Update uses that data to support a total of 16 mouse buttons. Task-number: QTBUG-24702 Change-Id: I3cffb32498f98ea182509d7c42f3fc6634155ebb Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Move variant animation interpolators from QtWidgets to QtGuiCharles Yin2012-03-135-5/+4
| | | | | | | | There is no reason these interpolators need to stay in QtWidgets library. Change-Id: I27db49fea2cfd8f0ef417dc52edf66dd1835e7a1 Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix QFont hinting preference with fontconfigBalazs Kelemen2012-03-121-18/+31
| | | | | | | | Consider if the hinting preference of the QFont is not PreferDefaultHinting. Change-Id: I0f50b320356787b6c1eabee5f009e7d326a06925 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Cleanup after the qsf cache file if it fails to be written toAndy Shaw2012-03-121-8/+25
| | | | | | | | | | It is possible that although a qsf cache file could be opened that it could not be written to, therefore it should clean up after itself in these cases so that it does not cause a problem later on. Task-number: QTBUG-24122 Change-Id: I1999759837607657ddc3f967eeda370ce9991a16 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* QSqlTableModel::isDirty(): new overloaded methodMark Brand2012-03-124-0/+185
| | | | | | | | | | | Checks if model has any changes to submit. Includes new test covering isDirty(index) as well the new overloaded function. Task-number: QTBUG-3108 Change-Id: I0ccbda45d5d9f06434cf1e1c037a9efb76d0cc37 Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com>
* Trailing comma should result in an error during JSON parsingAlexei Rousskikh2012-03-123-1/+22
| | | | | | | | | 1. QJsonParseError::MissingObject defined 2. QJsonDocument::fromJson() will result in defined error after parsing of something like "{ 'key':1 , }" or "[ {'key':1}, ]" Change-Id: I8e6234a03b8aca4e5ad6180f273f91066b86d7a1 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Clean up src.proDonald Carr2012-03-121-7/+1
| | | | | | | Removing (some) stale assumptions about dependencies from src.pro file Change-Id: I713e3ad8c164321ef035e6c62b25e18e45d1d3ef Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Input method on MacTasuku Suzuki2012-03-1210-5/+457
| | | | | | | | Restore input method implimentation in Qt4 Task-number: QTBUG-23867 Change-Id: I5d405ccc8b0a73c399d992f6474a0cc38d191157 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Check for PKG_CONFIG_LIBDIR when cross compiling.Girish Ramakrishnan2012-03-121-4/+4
| | | | | | | | | | | | | | | | When cross-compiling, check for PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH. pkg-config searches for pc files in PKG_CONFIG_PATH *and* the compiled in defaults (/usr/lib/pkgconfig). This means that pc files from the host get found when cross-compiling. Setting PKG_CONFIG_LIBDIR makes pkg-config search only in the path set in PKG_CONFIG_LIBDIR. Documented in the url below: http://www.freedesktop.org/wiki/Software/pkg-config/CrossCompileProposal Change-Id: I22dbf29c5691572b7cb8a5fce712ae7ba811670e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Move tst_qshortcut.cpp to QtWidgetsDebao Zhang2012-03-125-1/+1
| | | | | | | | QShortcut belongs to QtWidgets instead of QtGui. Change-Id: I9715399bb372a6ea4bd76109f87ba31a1e30a7e6 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Workaround webkit deadlock on macos xShane Kearns2012-03-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | The webkit AtomicallyInitializedStatic and Qt's Q_GLOBAL_STATIC can deadlock on the Mac, as the mac compiler inserts calls to __cxa_guard_acquire and __cxa_guard_release around initialisation of local statics. In Q_GLOBAL_STATIC case, this is the QGlobalStaticDeleter local static Whereas webkit AtomicallyInitializedStatic is a local static variable in any case. Problem is triggered because webkit constructs QNetworkConfigurationManager inside the constructor of a local static - networkStateNotifier And the generic bearer plugin calls QNetworkInterface::allInterfaces in the bearer thread, which needs an initialised Q_GLOBAL_STATIC. Reviewed-by: Laszlo Agocs (cherry picked from commit 38db40d9a2db44e47b0aabd9487284cd1106b353) Task-number: QTBUG-24554 Change-Id: Id2c7818faefb46e66b0bbc30ce30595d46d53016 Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
* Remove redundant wayland stuff from QtBaseJørgen Lind2012-03-123-114/+18
| | | | | | | | | | | Config checks are done in the module. We pick up the pkg-config stuff also in the module. There shouldn't be a need to do this in configure anyway Change-Id: I9ef73760511c6b684c6cd5dd13e7e581c588e7aa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Re-add the Systray example.Friedemann Kleint2012-03-129-1/+467
| | | | | | | | Remove its dependency on QtSvg by converting the icons to (optimized) png files. Change-Id: If63257938dc816d7ab76a3042b9ac88ef3d51b07 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Windows: Implement QWindowsIntegration::queryKeyboardModifiers()Friedemann Kleint2012-03-124-0/+22
| | | | | | | Use code from Qt 4.8. Change-Id: I32d220e04d13ee1e692c0c58268b827bcf519dc7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Implement QSystemTrayIcon for Windows.Friedemann Kleint2012-03-124-106/+164
| | | | | | | | | | | | No longer base the implementation on a QWidget which is not necessary when all that is required is a message window listening to task-tray messages. Export a service function creating a message window from the Windows native interface and use that. Task-number: QTBUG-20978 Change-Id: I01d0faeac777df4eee802c51d2bc722fce814080 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Don't define QT_NO_CORESERVICES on all platforms. That's just annoyingJørgen Lind2012-03-121-4/+6
| | | | | Change-Id: Id814bd0956b97c84ff0e6fcae8e5f22394c433e7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix the QMAKE_LIBS_WAYLAND variableJørgen Lind2012-03-121-1/+2
| | | | | | | | | | This variable is there for documentation, but its not being used anymore. There are two libraries from wayland, libwayland-client and libwayland-server. Add two variables that will be picked up in the QtWayland module. Change-Id: I16219092a4ed2e48080921ce39f61192b6abb711 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Move the auto test of QPixmap::grabWidget() from QPixmap to QWidgetDebao Zhang2012-03-122-43/+75
| | | | | | | Change-Id: Id565fa1eb8fe13c62a93a5afa39a5701ce7b20ea QPixmap::grabWidget is deprecated, which calls QWidget::grab() at present. Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* QRegularExpression: add error strings for translationGiuseppe D'Angelo2012-03-121-0/+115
| | | | | | | | | | Added the error strings from PCRE to be picked up by lupdate, to enable translations. Change-Id: Iaeabde5d7a17f9a0273511e0741e67a097d23a98 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Do not add -rpath-link directives with no library pathSean Harmer2012-03-121-3/+5
| | | | | | | | Doing so works fine on Linux as g++ version there silently ignores this. However, the qcc toolchain for QNX barfs. Change-Id: Ia236910adc09dc1653e4169e20476b69c2de62ab Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* tst_exceptionsafety_objects: add virtual ~AbstractTesterMarc Mutz2012-03-121-0/+1
| | | | | | | | | | GCC complained about undefined behaviour when deleting subclasses of AbstractTester through pointers to AbstractTester, and it's doing so correctly... Change-Id: Ie641281d8aafe32c5c9784e8aa39672ff0b699c7 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Add documenation about QAccessibleStateChange event.Frederik Gladhorn2012-03-121-0/+23
| | | | | Change-Id: Iea34d71d71a6dd58f761722ce20ae8ec2b81ae58 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Use QAccessibleEvent in test.Frederik Gladhorn2012-03-122-44/+46
| | | | | Change-Id: I4f9c0f503543caa5704a29c8ccd7c4134b455625 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Remove stale references to QtopiaDonald Carr2012-03-124-93/+0
| | | | | | | | | Change-Id: Idd9b5fae8f6a0273636a878325e82e5664a40d43 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Delete QPlatformDragPrivate object in QPlatformDrag's destructorjian liang2012-03-122-0/+3
| | | | | Change-Id: Ib722df14123b24ca044f6e0846aa1435c7e0e201 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QSqlTableModel::indexInQuery: fix inserted row accountingMark Brand2012-03-121-1/+1
| | | | | | | | | | | | Commit b979956ec46093e5668c2b264f9b68da3cbb0326 introduced a distinction between rows that have a pending INSERT operation and rows that have already been inserted in the database but still are in the change cache. Both cases are rows that are not in the underlying query. Unfortunately, we overlooked a case where the point of the test is whether the row is in the query. Change-Id: I0f58bed232d9336fed6e67c3d140fd580ec35868 Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com>