summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* remove symbian support from configureJoerg Bornemann2011-11-0712-767/+127
| | | | | Change-Id: Ib37defb1a69b3f8e5e5c6698f022291849f52716 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Re-enabled passing tests in tst_qinputcontextJo Asplin2011-11-072-2/+3
| | | | | | | | | | | To increase the effective test coverage, this patch re-enables the tst_qinputcontext test case as such, and instead disables only the test functions that are currently failing in CI. Task-number: QTBUG-22453 Change-Id: Ib1d4946ab29e67e0e72f4f9c6a7bf39b65d0f6be Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Re-enabled passing tests in tst_qprinterJo Asplin2011-11-072-1/+5
| | | | | | | | | | | To increase the effective test coverage, this patch re-enables the tst_qprinter test case as such, and instead disables only the test functions that are currently failing in CI. Task-number: QTBUG-22453 Change-Id: I74cc30dc26b8b83852b3516f8def995eab19cf0f Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Fix QQuickTextInput implicit width.Andrew den Exter2011-11-071-1/+2
| | | | | | | | | | QQuickTextInput tries to set the UseDesignMetrics text option on its QLineControl but this is overridden by the options set in updateDisplayText(). Apply the new options in updateDisplayText to the existing options. Change-Id: I6789c3c2d6e496c1594d586bd075473983978f77 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* SSL certificate extensions: add unit testsRichard Moore2011-11-061-0/+89
| | | | | | | | Added tests for each of the supported extensions, and also for the handling of unknown ones. Change-Id: I29e0a5c1a411f41c2a554293662a33b56f205c00 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* SSL certificates: add functionality to read extensionsRichard Moore2011-11-069-12/+628
| | | | | | | | | | ... by adding a new class QSslCertificateExtension and methods in QSslCertificate to support extensions. This is needed e.g. for OCSP (checking revocation status of a certificate) or Extended Validation certificates. Change-Id: I5c5d9513fa640cd487786bb9a5af734afebd0828 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Reinstate and deprecate the two argument QMetaType::constructKevin Simons2011-11-051-0/+4
| | | | | | Change-Id: Id291f00ba13a39b4af022b75fd428b876d6dd9b0 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* QLineEdit - made mouse interactions commit preeditPekka Vuorela2011-11-055-16/+83
| | | | | | | | | | | | | | | | Simplifying input context mouse handling rules by making the editor in charge when text gets committed and selected. This includes: - Allowing selection to start on top of preedit. Commits once a single character gets selected - Double click to commit preedit before selecting a word. - Only sending events to input context that happen on top of preedit. - Committing preedit when a mouse press happens outside of it, allowing to move cursor to click position. Change-Id: I9dab00ea3445055ffd0d7cae540a1197c5748509 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix broken indendation with hard tabsPekka Vuorela2011-11-051-4/+4
| | | | | | Change-Id: I1aa161ddab55f11683b2eee3c205505a829013c4 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* Support tentative commit string with input method.Pekka Vuorela2011-11-056-5/+86
| | | | | | | | | Tentative commit string allows input method to notify editor what is expected to be committed in the place of preedit. This commit adds such support in QLineEdit. Change-Id: If855619bc6843652db0d6254f7e7063bb8ad0936 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* QTextEdit - mouse events to override input contextPekka Vuorela2011-11-052-100/+121
| | | | | | | | | | - Selection can start on top of preedit - Mouse press outside preedit commits - Double click to commit on top of preedit Change-Id: Ia2698d97d354a677d935de1a8fd9ed53a161ca5e Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Moved qmetaobjectbuilder test into corelib/kernel/Jo Asplin2011-11-055-8/+2
| | | | | | | | This commit moves the qmetaobjectbuilder test from test/auto/ into corelib/kernel/ since that matches the location in the Qt source. Change-Id: I0342e8185ce775b0ef71849f365bf54c8fb56da4 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Remove unused PlatformQuirks functions.Jason McDonald2011-11-051-33/+0
| | | | | | | | These functions are no longer used anywhere in qtbase and are highly unlikely to be used elsewhere. Change-Id: I8e7c433c3b3e799ce0e5bc465182a5046275eb00 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Moved qobjectrace into integrationtests/Jo Asplin2011-11-055-1/+1
| | | | | | | | | | | The qobjectrace test seems to belong to integrationtests/ since it tests the interaction between QObject and QThread (much in the same way integrationtests/qsharedpointer_and_qwidget/ tests the interaction between QSharedPointer and QWidget). Change-Id: I89f1dab7300c2ef23755d52a86479677ef021ef1 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Allow disabling FreeType internal cacheJiang Jiang2011-11-052-155/+112
| | | | | | | To disable it, set QT_NO_FT_CACHE environment variable to 1. Change-Id: I086aa93c71cbdf86858a41a2bbad5d2db247cdfb Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Fix a warning in QGlyphRun compilationJiang Jiang2011-11-051-0/+1
| | | | | Change-Id: Ic072240193fc8eb5e7fdcd0dada79383398b224b Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Restore subpixel rendering support with fontconfig and FreeTypeJiang Jiang2011-11-052-7/+35
| | | | | Change-Id: I45cf83374ba5a8b1ae88415950c1e5ab72991598 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Moved tests into gui/kernel/ and gui/qopengl/Jo Asplin2011-11-0410-6/+6
| | | | | | | | | | | | | | This commit moves tests from test/auto/ into more appropriate locations (i.e. matching the locations in the Qt source): - qscreen and qwindow are moved into gui/kernel/ - qopengl is moved into gui/qopengl/ Note: qscreen is disabled for now since it is broken on Linux (see QTBUG-22554). Change-Id: Idcc7a51e78d6d0955bddb9cb4091866659193cc8 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Prevent timestamps in widgets' touch events from disappearingLaszlo Agocs2011-11-046-40/+54
| | | | | Change-Id: I096914eb2b02ad9c4a5c0462a1f4b76ef17c3957 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Added ref to bug report in qglthreads.proJo Asplin2011-11-041-1/+1
| | | | | Change-Id: Iecbda846eada49634b473959c642b8ee4c46c5c1 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Added -datatags option to QTestLibJo Asplin2011-11-0412-1/+341
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Note: This feature is ported from Qt 4.8. See the following commits: 01575deafb7d26ca2431374e92c6d71de96547c7 4866d1ba8afbab61e102942d1ea93b81fea053d6 ) Passing the -datatags option to a QTestLib program prints the available data tags to standard output. For completeness, the test case name is also printed at the start of each output line. (Although the file name is supposed to match the lower-case version of the test case name, this is currently not true in all cases (particularly not under tests/benchmarks/). Even if there was a script to enforce this convention, the -datatags option provides this information in a reliable way.) Data tags for each test function (f() in this case) are printed in four different ways depending on the presence of local and global data tags: Case 1: No tags: tst_MyTestCasetst_MyTestCase f Case 2: Local tags only: tst_MyTestCase f local tag 1 tst_MyTestCase f local tag 2 ... Case 3: Global tags only: tst_MyTestCase f __global__ global tag 1 tst_MyTestCase f __global__ global tag 2 ... Case 4: Local and global tags: tst_MyTestCase f local tag 1 __global__ global tag 1 tst_MyTestCase f local tag 2 __global__ global tag 1 ... tst_MyTestCase f local tag 1 __global__ global tag 2 tst_MyTestCase f local tag 2 __global__ global tag 2 ... ... Note that the string __global__ is assumed to be highly unlikely to occur in a data tag (if it does, an ambiguity results). Change-Id: Ib51aa0c3c32ad52e52ce519729292cf8f0ec5d50 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* qmake: vcproj ignores subdirs that do "no_default_target".Friedemann Kleint2011-11-041-0/+6
| | | | | | | | | | | | | | | It's nicer to do: SUBDIRS += foo foo.CONFIG = no_default_target no_default_install then to omit foo from SUBDIRS because a Makefile is still produced but "make" and "make install" don't descend automatically. The vcproj generator doesn't know about this. This patch gets it to check for no_default_target and then it simply ignores the directory. Change-Id: I127bea79143c101612afb0e9c6603d3b065c7c56 Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* add integrity gbuild to the project file for convenienceOswald Buddenhagen2011-11-041-0/+2
| | | | | Change-Id: I126eec019695bef7dd418d122ad911d9a10e0aa4 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix usage of QtConcurrent headers with -Wshadow -WerrorDavid Faure2011-11-041-2/+2
| | | | | Change-Id: I172888518a3db01f89e61061eccf85f7f3387d07 Reviewed-by: Olivier Goffart <ogoffart@kde.org>
* Windows: Add dialog helpers for native dialogs.Friedemann Kleint2011-11-049-0/+1506
| | | | | | | | Implement QPlatformDialogHelper for file dialogs based on IFileDialog. Add prototypical implementation of color dialogs. Change-Id: If3c7470be6c0b8fbf8cfea1b6638bda43afafea7 Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
* Revert "Avoid fontconfig access in fontEngine creation"Jiang Jiang2011-11-042-25/+43
| | | | | | | | | | | This reverts commit 8dcb52df8e2e949232ccded9fad5a4f25ba6dda2. Turns out that hint style is retrieved from font match instead of pattern match, which shouldn't be retreived until font engine creation. Change-Id: I90e779a3823e6a6604cdadb52586fcd5e22c295b Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Re-enabled passing tests in tst_qvariantJo Asplin2011-11-042-2/+3
| | | | | | | | | | | To increase the effective test coverage, this patch re-enables the tst_qvariant test case as such, and instead disables only the test functions that are currently failing in CI. Task-number: QTBUG-22453 Change-Id: Ibf0dc3caf50d34084fa50cf76d199e77a42f6e16 Reviewed-by: Olivier Goffart <ogoffart@kde.org>
* Improve QtGui start-up time and memory use.Samuel Rødal2011-11-043-61/+98
| | | | | | | | The gamma lookup tables can be allocated and computed on demand, as they're not always needed, depending on the platform and the use case. Change-Id: I2d4c2860746366a0e46edb53bd4ecd2778de2464 Reviewed-by: Olivier Goffart <ogoffart@kde.org>
* test: Use QWidget::grab() instead of QPixmap::grabWidget()Sergio Ahumada2011-11-041-3/+3
| | | | | | | | | Removing warnings from the test function as QPixmap::grabWidget() is being deprecated. Change-Id: I26ad1e9def0bebe8e4ee997068ba593245d0cd05 Reviewed-by: Jo Asplin <jo.asplin@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Revert "Fixed deployment problems with MSVC 2005 and 2008 SP1"Joerg Bornemann2011-11-042-2/+2
| | | | | | | | | | | | This reverts commit ec41d27565ed0b4d517f30563def135d0b4c7a8d. Adding the define _BIND_TO_CURRENT_VCLIBS_VERSION led to linking problems for several people. Also, this leads to problems when using the binary installer for development. Change-Id: I4097c8d0962c633bab6edbb86df9046d93148cab Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Revert "Use standard spelling for two languages"Lars Knoll2011-11-043-51/+51
| | | | | | | | | | | This reverts commit 9358f7eaa4b773bdbfa45b08ab92a89096954881. The change is source incompatible and hasn't been agreed upon. Revert it even though it's correct in principle. It's simple to keep the old enums around for compatibility. Change-Id: I8d9d33868e44d0299a3f081833b06cedf0ed4345 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QStandardPaths: add DownloadLocation.David Faure2011-11-046-3/+14
| | | | | | | | | Only properly implemented on unix (XDG), falls back to Document location on Mac and Windows, because not easily available with the current API being used by either one. Change-Id: Id269f0e3c4e3a68e19205de96c0b39980fde80ff Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix tst_qstandardpaths: Mac OSX is a unix, but doesn't use XDG.David Faure2011-11-041-5/+9
| | | | | Change-Id: I2b4552a162dc9f993e0587ace6e7e3fb4f96571e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Re-enabled passing test in tst_qdbuspendingcallSergio Ahumada2011-11-041-2/+0
| | | | | | | | | tst_QDBusPendingCall::watcher_waitForFinished_threaded() autotest was fixed by faa6113c41b81368c5bbc2a764c2ae9bbc42e415 Task-number: QTBUG-20859 Change-Id: I05aaebfde45862836b10700aa7d9c64e4287466f Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Don't rely on PlatformQuirks in qimagereader testJason McDonald2011-11-041-6/+3
| | | | | | | | | | | | | | The PlatformQuirks header is, by its author's own admission, based on "very bad assumptions", those being that only Meego has quirks. The assumption that only Meego has versions of libjpeg and libpng with rounding errors is not a good assumption. Change the test to be a little tolerant of rounding error regardless of the platform, at least until there's a reliable way to tell which libjpeg/libpng versions have rounding errors. Change-Id: Id2be5cc54739249b615bf3307ee1850c0a5c06b3 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Do not put cursor at non-stop character positionsJiang Jiang2011-11-042-2/+20
| | | | | | | | | | | When moving cursors, non-stop positions are skipped, however certain input sequences can still lead us there. In such cases we should simply ignore those positions in cursorToX. Task-number: QTBUG-7076 Change-Id: Ia0a25931f4043359f72a6c0c14a74b905e40b93e Reviewed-by: Eskil Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Release font engine refcount when done using it in QTextEngineJiang Jiang2011-11-043-5/+12
| | | | | | | | | | | | | 5f2b6dd2a50275bc05ae5d7e9dd8902d6d49d9df increased refcounts for font engines in QTextEngine cache, we need to decrease them when the QTextEngine is deallocated. Task-number: QTBUG-21222 Reviewed-by: Eskil (cherry picked from commit 8935a84e18804c7ff4b7336e3cfdf1cd558eaf1c) Change-Id: I079c903d60e1bbcf78f555f8044dde69af82cf0e Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Use standard spelling for two languagesJiang Jiang2011-11-043-51/+51
| | | | | | | | Singhalese -> Sinhalese Divehi -> Dhivehi Change-Id: I3faa7163202a4a9be14e3cf857da60aa4dd3196f Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* QWidgets: Delayed creation of the QPlatformDialogHelper.Friedemann Kleint2011-11-044-41/+52
| | | | | | | | | - Create helper only once and ensure deletion - Move nativeDialogInUse into QDialogPrivate, ensuring the native modal helper is called from QDialog::exec() only if it is true Change-Id: Id92b278bb051ce254458f276fbf7075689a7d491 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Re-enabled passing tests in tst_qlistviewJo Asplin2011-11-042-2/+1
| | | | | | | | | | | To increase the effective test coverage, this patch re-enables the tst_qlistview test case as such, and instead disables only the test functions that are currently failing in CI. Task-number: QTBUG-22453 Change-Id: I029be60c16cdff5ee3e38889d2780f1ee7d01b51 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Add QT_MODULE(Gui) macroSergio Ahumada2011-11-031-0/+2
| | | | | | | | | Fixing `macros' function test of `tst_headers' Task-number: QTQAINFRA-324 Change-Id: Ib6fcf276108bbb5515a72f3f17b373de82a599fc Reviewed-by: Olivier Goffart <ogoffart@kde.org> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* QtGui: Fix compilation with gcc 4.4Friedemann Kleint2011-11-037-88/+137
| | | | | | | | | | | | - Do not mix QStringLiteral and Q_TR_NOOP. - Replace static QString member variables by - static member functions to return the strings. - Use tr() since QAccessibleActionInterface declares it. Acked-by: Frederik Gladhorn <frederik.gladhorn@nokia.com> Change-Id: Iabbee8ef61a5d7bfd35978a3f1cce1866329d065 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* test: Skipping tst_qmdisubwindow::setFont() as it's unstableSergio Ahumada2011-11-031-0/+1
| | | | | | | | | This unstable test is preventing some good changes from being merged. Further investigation needs to follow, so people can refer to QTBUG-22544 for a real fix. Change-Id: I038e5f340ccd2562d0e67428af595a2bcfc8c11d Reviewed-by: Olivier Goffart <ogoffart@kde.org>
* Fixed returned geometry of toplevel child widgetsOliver Wolff2011-11-031-11/+9
| | | | | | | | | | | If a widget has got a parent widget but also is a toplevel widget it should not return its geometry relative to its parent. In addition to that, child widgets which are not toplevel should not change their left and top values according to their parent but also keep their width and height intact. Change-Id: I5e641abf5ddc0b8d056ba023f8de52af1d2ccc9f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix unstable test due to a race in QThreadBradley T. Hughes2011-11-031-1/+1
| | | | | | | | | | | | | QThread::finished() is emitted before setting the thread's state to finished and !running, which means it's possible to receive the finished() signal and act on it while QThread::isRunning() still returns true. This test randomly fails due to this race. Fix it by using checking the return value of QThread::wait() instead. Change-Id: Ibf347fc9a2e8d32b328227ee6978e1129dd781f4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QThread::isFinished should return true from finished()Olivier Goffart2011-11-032-2/+36
| | | | | | | | | | | | | | | | | | | and isRunning() should return false. This restore the Qt 4.7 behaviour In Qt 4.7, the finished() was called with the thread's intenal mutex locked. Which mean that: - Call to isRunning or isFinished called from a slot connected to finish within the thread would deadlock. (Hence no compatibility to keep here) - Call to isRunning or isFinished from a slot connected with QueuedConnection in another thread would lock the mutex until the destructors are finished. and then return as if the thread have finished. Change-Id: I963eccae8f7634aff90cc4bbab6ca886a78e35eb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Enable deprecated feature for nowOlivier Goffart2011-11-031-2/+3
| | | | | | | | | | | | | | | Rationale is that it makes it possible to deprecate functions without breaking other modules. After the feature freeze, this should be reset to 5 Notice that QT_DEPRECATED is not defined while bootstrapping Qt (QT_NO_DEPRECATED defined) This also means that compilation is tested Change-Id: I85f0e65ac3a160e9aba3833787ded3f94304cb90 Reviewed-by: David Faure <faure@kde.org>
* Renamed QTextLayout member variable for readabilityPekka Vuorela2011-11-032-39/+39
| | | | | | | | | Class complex enough already without int i as member variable. Furthermore, some methods use loop variable with same name, shadowing the member one. Change-Id: Idf2f5e34f130a60eb6121480e596e443f23641dd Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Documented side-effect of QTextLayout::setPreeditArea()Pekka Vuorela2011-11-031-1/+2
| | | | | | | Invalidates layout and requires layouting again. Change-Id: I1cb954f155e4fc1df4b217478998ac903cc18323 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Fix regular expression when replacing headersHarald Fernengel2011-11-031-1/+1
| | | | | | | | Use non-greedy capturing where it makes sense, also keep the user's whitespace indentation in his include statements Change-Id: Iff2b5dabf443529292e943ae69427bd15e702bf9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>