summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move the module qdoc files from qtdoc and split up doc/src.Casper van Donderen2011-09-1945-0/+148
| | | | | | | Change-Id: I7d992889379d78e07a0b7023facebd7421cf6d22 Reviewed-on: http://codereview.qt-project.org/5092 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Support synthesized oblique and bold in SceneGraphEskil Abrahamsen Blomfeldt2011-09-192-3/+21
| | | | | | | | | | | | | | | When fetching the outlines we need to synthesize the weight and style of the requested font. This is currently only supported on FreeType versions that have the Embolden and Oblique functions. We also use FreeType's Oblique function for regular text when possible, and only use the matrix approach when that function is unavailable. Task-number: QTBUG-21202 Change-Id: I0656ab66cc3ec70d6a7675b8c78d06632625261c Reviewed-on: http://codereview.qt-project.org/5076 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Enable glyph caching on QPAEskil Abrahamsen Blomfeldt2011-09-191-31/+3
| | | | | | | | | | | | The glyph caching was disabled on QPA, possibly due to some bugs which have gone away now. To avoid the performance hit of this, we need to enable it. Simple tests of QTextEdit indicate that this works fine. Change-Id: I40845b327331b366161f1ca55bf00853bca87358 Reviewed-on: http://codereview.qt-project.org/5096 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Remove gui-related ifdef from testlib/qbenchmark.cppKent Hansen2011-09-191-4/+0
| | | | | | | | | | It didn't make sense, since testlib doesn't link against gui. The QApplication api wasn't used anywhere anyway. Change-Id: Idb1bd20c7bcd0f9f16a9b526a7dabe4afccecfc4 Reviewed-on: http://codereview.qt-project.org/5058 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Treat QTestFontEngine properlyJiang Jiang2011-09-191-1/+1
| | | | | | | | | | Do not try to fill fontDef when it's a test font engine, otherwise it will cause a crash because desc.family is 0. Change-Id: I008b784bae3e60a25c33c285d944442a3616a9a2 Reviewed-on: http://codereview.qt-project.org/5103 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Fixed xcb-render config test.Samuel Rødal2011-09-191-1/+1
| | | | | | | Change-Id: I5f9f2beb57a2bc6b4e44dcd71a03cfdcf69cae45 Reviewed-on: http://codereview.qt-project.org/5086 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Fix the test caseLars Knoll2011-09-172-2/+3
| | | | | | | | | | | | | If the MKSPEC we get is an absolute path, we should pass that one on to qmake. Otherwise it'll try to find the mkspec in the install location. This fails as 'make check' is being run before installation. Task-number: QTBUG-21402 Change-Id: Ie872546f2ee7c5d737e50a1779637e393538ccc2 Reviewed-on: http://codereview.qt-project.org/4999 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* correctly initialise private data in QTouchEventSequence constructorMatthew Cattell2011-09-171-2/+2
| | | | | | | Change-Id: Ia43ab0af4dfbaa824e76f744030e98f29e898bac Reviewed-on: http://codereview.qt-project.org/4973 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jo Asplin <jo.asplin@nokia.com>
* Make sure libQtPlatformSupport has proper flagsJiang Jiang2011-09-171-0/+1
| | | | | | | | | | | If we don't have Q_FONTCONFIGDATABASE flag, QGenericFontDatabase will be defined to QBasicUnixFontDatabase even when fontconfig is available. Change-Id: I0e79ed8488163cea32352e3fc300acd92ca4bd93 Reviewed-on: http://codereview.qt-project.org/4962 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Simplify selftestJason McDonald2011-09-171-17/+11
| | | | | | | | | | Don't store separate strings for the logger name and the associated file suffix -- just use the same string everywhere. Change-Id: Ie7d1af6bf906b5ac09fbd5fcc5754b68036fb370 Reviewed-on: http://codereview.qt-project.org/5060 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Improve cleanup of selftestsJason McDonald2011-09-171-2/+3
| | | | | | | | | | | | The selftest was only attempting to delete the output file at the end of the entire test run. This file should actually be deleted after each subtest to ensure that it does not cause confusing errors if the next subtest fails to overwrite the output file. Change-Id: Ia3827926f71a697c6108de3f2b08c969f761d978 Reviewed-on: http://codereview.qt-project.org/5051 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove obsolete QEXPECT_FAIL callsJason McDonald2011-09-171-2/+0
| | | | | | | | | | The removed calls related to tests that were removed when redundant logging functionality was removed. Change-Id: Iaebbc109eaaddb440ae78e1f4a1b4e874a8b2960 Reviewed-on: http://codereview.qt-project.org/5050 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Improve compliance with Qt coding guidelinesJason McDonald2011-09-171-60/+48
| | | | | | | | | | | | * Use C++ comment delimiters consistently * Use a space after control flow keywords * Don't nest "else if" blocks unnecessarily * Follow indenting rules * Added comments describing some internal functions Change-Id: I72fd1eaf5c5f3130945fbd2b64fa59e19ad2913d Reviewed-on: http://codereview.qt-project.org/5049 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix XFAIL in testlib selftestJason McDonald2011-09-174-5/+5
| | | | | | | | | | | Commit 949be8cbdd2d346647accbbd9bdab879256470ec modified the assert test case but failed to update the line number of the assert in the expected test output files. Change-Id: I0d4f55c0b8bc1de8487dd8c6267aa459000cda26 Reviewed-on: http://codereview.qt-project.org/5048 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* minor docu fixesKonstantin Ritt2011-09-171-5/+5
| | | | | | | | | | | Merge-request: 2646 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com> (cherry picked from commit 2fa6d410c6733863b19393c13efbdcb7efd59fc0) Change-Id: Ic66de960c5ec63a669b164ebf6fadcc4f59295f6 Reviewed-on: http://codereview.qt-project.org/5033 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Wrap calls to Sequence::push_backJoão Abecasis2011-09-174-20/+32
| | | | | | | | | | | | | | | | | | | | | | | In C++11 push_back is overloaded to support rvalue-references, void std::vector<T>::push_back(const T &); void std::vector<T>::push_back(T &&); so attempting to get the address for push_back is ambiguous. Instead of hardcoding the function signature, the better and more general solution is to allow the compiler to do the required overload resolution itself, also allowing for implicit conversions to take place. Task-number: QTBUG-18996 Done-with: Liang Qi Reviewed-by: Olivier Goffart (cherry picked from commit ca34cc75294e0d2a8bc491a2c679fe8a69cd0408) Change-Id: Id271118e489f888905e491dd4cfc3d2db7697552 Reviewed-on: http://codereview.qt-project.org/4642 Reviewed-by: Liang Qi <liang.qi@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Compile in C++0x modeLars Knoll2011-09-171-4/+8
| | | | | | | Change-Id: If97bdd94a51756e48167990a4014ba1059d0a507 Reviewed-on: http://codereview.qt-project.org/5026 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fixed XComposite hardware integration in wayland plugin.Samuel Rødal2011-09-173-3/+3
| | | | | | | | | | We should set both the pixmap and window bits for XComposite to work on a stricter EGL / GLX implementation. Change-Id: Ie1be44ebcc68fed87f48c74dffd887ffae1189d5 Reviewed-on: http://codereview.qt-project.org/4893 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* Set the correct buffer pointer (protected member variables are evil).Samuel Rødal2011-09-171-1/+1
| | | | | | | Change-Id: I6cdd64fbee5a9b46b44d8fadfc0f443dd1f4b140 Reviewed-on: http://codereview.qt-project.org/4862 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Fix trailing spaces problem by not adding it to QScriptLine.lengthJiang Jiang2011-09-173-5/+7
| | | | | | | | | | | | | | | | | | | | | | It seems to be the only sane way to fix it. Previous attempts to fix it by compensating the trailing space width all failed in some cases, one of the trickiest is when we are having embedded LTR text that has trailing spaces in a RTL paragraph. In this patch we leave line.length not including the trailing space length, but saving it to a separated variable, so that we can always add it back when needed (QTextLine::textLength() for instance). It fixed all the problems in different alignments of both RTL and LTR text. And no regression is found yet. Reviewed-by: Eskil (cherry picked from commit 80294c375eca9687d1c34e9ab048294373e7f00c) Change-Id: Id248ab6f54f8cc25ba0e9d1626703463dfefbcea Reviewed-on: http://codereview.qt-project.org/4778 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Avoid fontconfig access in fontEngine creationJiang Jiang2011-09-172-43/+25
| | | | | | | | | | | | The only thing we need to know at fontEngine creation is the hinting style, we can just store it in enumeration process and get it back from user data pointer. So that fontEngines can be created without access to fontconfig at all. (Since we are doing our own matching.) Change-Id: I5ab2d1f27e28787447aedcbdef16555fb0f1b604 Reviewed-on: http://codereview.qt-project.org/4769 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Mac: fix linking with Qt frameworks which don't exist at qmake timeRohan McGovern2011-09-172-3/+15
| | | | | | | | | | | | | | This restores the forced-vs-detection logic for Qt frameworks which was removed by commit ceed409b40fd5b8fe5c62ac33144e66f50b28ede. The problem of linking against Qt modules compiled as a static library is solved a different way: the module must explicitly state in the module .pri file that it is built as a static lib. Change-Id: Ie3d726f7b3933e5b5d27f15c6112ec1c7dee1ea2 Reviewed-on: http://codereview.qt-project.org/5034 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Fixed Test for QStyleSheetStyle after refactor mergeHolger Ihrig2011-09-162-2/+1
| | | | | | | | | Task-number: QTBUG-21468 Change-Id: I869ae07c834f6d76180d2e29871b8dc9ccb3f523 Reviewed-on: http://codereview.qt-project.org/4963 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
* Accessibility: TabWidget - remove virt children, add action interface.Frederik Gladhorn2011-09-163-76/+167
| | | | | | | | | | | Remove virtual children by creating accessible objects for tab buttons. Add action interface to activate tabs. Change-Id: Ifc5e8ae6ec2708df97bbb9a94ddc1421d431ff87 Reviewed-on: http://codereview.qt-project.org/4793 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com> Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Set accessible name on QTabBar buttons.Frederik Gladhorn2011-09-161-1/+4
| | | | | | | Change-Id: Id1993d75ec56952b26f158997414b43b857808cd Reviewed-on: http://codereview.qt-project.org/4791 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* For complex widgets try to return accessible interfaces.Frederik Gladhorn2011-09-162-3/+8
| | | | | | | | | | | | Some of the complex' widgets children can return QAccessibleInterfaces. Ideally all complex widgets should be removed, this eases the transition. Change-Id: If3d7f28f97dac8cf5018a2c4c4b33709a3d4595c Reviewed-on: http://codereview.qt-project.org/4788 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com> Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Fix xcb-icccm 3.8 supportJędrzej Nowacki2011-09-151-3/+15
| | | | | | | | | Build fix on platforms having xcb-icccm >= 3.8 Change-Id: Ia20c9a439d57e147db90d635679e471bfa02c840 Reviewed-on: http://codereview.qt-project.org/4779 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix Xcb autodetection during configure.Jędrzej Nowacki2011-09-152-0/+10
| | | | | | | Change-Id: I550e633d49cfcf4df393ae7d691e7f407276eb58 Reviewed-on: http://codereview.qt-project.org/4781 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Boost performance of QChar::isSpaceKent Hansen2011-09-153-5/+35
| | | | | | | | | | | | | | | | | | | | | Make it inline; add fast checks for typical spaces; add fallback function that uses the fastcall calling convention. On ia32, this change makes isSpace ~340x faster for ascii spaces, ~170x faster for non-space ascii characters, and ~1.3x faster for non-ascii characters. Note that this change is NOT binary compatible. Also add an autotest with expected results from before the optimization, to ensure that the behavior is the same. Change-Id: I9438d0ad3c9ba2e80560c4bee7eed05115265798 Reviewed-on: http://codereview.qt-project.org/4905 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Boost performance of QChar::isLetterOrNumberKent Hansen2011-09-153-3/+41
| | | | | | | | | | | | | | | | | | | | | | Make it inline; add fast checks for ascii letters and digits; add fallback function that uses the fastcall calling convention. On ia32, this change makes isLetterOrNumber ~120x faster for ascii letters and digits, ~150x faster for non-letter/digit ascii characters, and ~1.3x faster for non-ascii characters. Note that this change is NOT binary compatible. Also add an autotest with expected results from before the optimization, to ensure that the behavior is the same. Change-Id: Ia4e13692f4dd79f6aa0b96da29449e0487971b0e Reviewed-on: http://codereview.qt-project.org/4904 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Boost performance of QChar::isLetterKent Hansen2011-09-153-3/+44
| | | | | | | | | | | | | | | | | | | | | Make it inline; add fast checks for ascii letters; add fallback function that uses the fastcall calling convention. On ia32, this change makes isLetter ~370x faster for ascii letters, ~250x faster for non-letter ascii characters, and ~1.5x faster for non-ascii characters. Note that this change is NOT binary compatible. Also add an autotest with expected results from before the optimization, to ensure that the behavior is the same. Change-Id: I06f8d3d43114537cee5567e670898cef6494c20a Reviewed-on: http://codereview.qt-project.org/4903 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Boost performance of QChar::isDigitKent Hansen2011-09-153-3/+34
| | | | | | | | | | | | | | | | | | | | | | Make it inline; add fast checks for ascii digits; add fallback function that uses the fastcall calling convention. On ia32, this change makes isDigit ~370x faster for ascii digit characters, ~250x faster for non-digit ascii characters, and ~1.5x faster for non-ascii characters. Note that this change is NOT binary compatible. Also add an autotest with expected results from before the optimization, to ensure that the behavior is the same. Change-Id: I718fadecda3f591d6f4c22374d8e476f4724fd83 Reviewed-on: http://codereview.qt-project.org/4902 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Boost performance of QChar::is{Upper,Lower}Kent Hansen2011-09-151-2/+8
| | | | | | | | | | | | | | | | | | | | | Calling QChar::category() is slow; do some fast checks to detect ascii characters before falling back to the generic handling. On ia32, this change makes isUpper ~260x faster for uppercase ascii characters, and ~180x faster for non-uppercase ascii characters. Similar numbers for isLower. Even with the additional checks, these versions are slightly faster than before for non-ascii characters as well, since we now call the static fastcall category(ushort) function, which is faster than the category() member function (which uses the stack to pass the unicode value). Change-Id: I6ae0df466bb4835ca0d5319fd6018862c849313b Reviewed-on: http://codereview.qt-project.org/4901 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Add benchmark for QCharKent Hansen2011-09-152-0/+157
| | | | | | | | | | | | | | | | The benchmark isn't exhaustive, but tests the functions that are heavily used by QtDeclarative. For performance reasons, QtDeclarative has its own implementation of various QChar functions (in qdeclarativeutils_p.h). But we want to make the actual QChar functions as fast, so that QtDeclarative can also use them. Change-Id: Ic25f30651224c39f2824380d679b8500739f38c3 Reviewed-on: http://codereview.qt-project.org/4900 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix include path.Frederik Gladhorn2011-09-151-1/+1
| | | | | | | | | | Reviewed-by: Gabi Change-Id: I99b08f8b41f483c92ae175630b812e4b299069b6 Reviewed-on: http://codereview.qt-project.org/4916 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
* The Q_WS_X11 define exists no longer. Use Q_OS_UNIX.Frederik Gladhorn2011-09-156-70/+71
| | | | | | | Change-Id: I1c4b5d4187e1593aa52bc9162d9692959b55e077 Reviewed-on: http://codereview.qt-project.org/4786 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Fix warning when building objects with a Q_OBJECT macroTobias Hunger2011-09-151-1/+1
| | | | | | | | | | | | Do not trigger a self-assign warning when running into code containing a Q_OBJECT macro. Currently this happens a lot e.g. when using clang to build code using Qt. Change-Id: I68995624b18406f337318599e463f36f87486e66 Reviewed-on: http://codereview.qt-project.org/4960 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Re-add QT_GCC_*_VERSION qmake variablesSimon Hausmann2011-09-151-0/+24
| | | | | | | | | Commit 7493ee1c44a16dc3b155a5bf3ed7ca966a71072a accidentally removed them. Change-Id: Ia5132b374ded047ae19479bc98d8564f527e5be2 Reviewed-on: http://codereview.qt-project.org/4970 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* doc: Fix incorrect enum name in QRawFont::alphaMapForGlyph docsEskil Abrahamsen Blomfeldt2011-09-151-1/+2
| | | | | | | | | | | | | There's no QImage::Format_A8 format. This is a term used in the corresponding QFontEngineGlyphCache enum. Reviewed-by: Jiang Jiang (cherry picked from commit e453fce2731069dce993a94b0c2291307cc7806c) Change-Id: I68a190abdf4446d05231af89ac861380ac79b188 Reviewed-on: http://codereview.qt-project.org/4773 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Properly register preedit text in QLineControlEskil Abrahamsen Blomfeldt2011-09-151-1/+0
| | | | | | | | | | | | | Removes the QT_NO_IM macro which was a temporary measure during refactoring work. This macro disabled the setPreeditArea() call and caused only the formats of the preedit text to be registered, not the actual string. Task-number: QTBUG-21261 Change-Id: I76cdf116043520fa2185ddcd34739da031c0fcdc Reviewed-on: http://codereview.qt-project.org/4958 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* compile when shadowing is an errorGunnar Sletta2011-09-152-10/+10
| | | | | | | Change-Id: If12cd19821d07303e808e19be1ee3984c90110b1 Reviewed-on: http://codereview.qt-project.org/4946 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Get the 'dockwidgets' example to compile.Jason Barron2011-09-151-1/+1
| | | | | | | | | Required printersupport. Change-Id: Idd525e847f793631b70204d25c4fc949279801bf Reviewed-on: http://codereview.qt-project.org/4915 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Get the Windows GL context to compile.Jason Barron2011-09-151-5/+1
| | | | | | | | | | Not sure why this was not the case all along, but on my MSVC2008 installation the include must be prefixed by the 'GL' directory. Change-Id: Icb29b072446bab386b5c62ab0df453ded41b8ede Reviewed-on: http://codereview.qt-project.org/4914 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Make the Windows input context compile after the refactoring.Jason Barron2011-09-152-23/+14
| | | | | | | | | | | | There is no longer a focusObject setter/getter in the input context. Instead the object can be gotten from the new input panel API. Instead of reimplementing setFocusObject(), implementations should now connect to the inputItemChanged() signal of QInputPanel. Change-Id: I6c674424da5a0c8c3995e5f5acd191ef91ba8a00 Reviewed-on: http://codereview.qt-project.org/4913 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fixed crash in tst_QPathClipper.Samuel Rødal2011-09-152-3/+1
| | | | | | | | | | QPathClipper uses QPainter which requires QGuiApplication. Task-number: QTBUG-21402 Change-Id: If08b0ddee97cad347450fa06878f787e94292854 Reviewed-on: http://codereview.qt-project.org/4777 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fixed tst_QIcon::task184901_badCache().Samuel Rødal2011-09-152-32/+30
| | | | | | | | | | | QIcon has not been moved to QtGui after all, re-introduce QtWidgets-dependent code path. Task-number: QTBUG-21402 Change-Id: I61c37babaeceadf7d53c10736bcc847758adaf1b Reviewed-on: http://codereview.qt-project.org/4775 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fixed tst_qpixmap::grabWidget().Samuel Rødal2011-09-152-2/+2
| | | | | | | | | | | | prepareToRender() might call adjustSize() resulting in the widget's size changing, so we should make sure to call adjustSize() _before_ we decide on the required pixmap dimensions. Task-number: QTBUG-21402 Change-Id: Ie72b46bc8e8e22f848769f78187f47ae9f4e37d3 Reviewed-on: http://codereview.qt-project.org/4772 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove AccessibleEx classes.Frederik Gladhorn2011-09-1519-355/+204
| | | | | | | | | | | This was a binary compatibility hack to extend the accessibility framework towards IAccessible2. Start fixing it properly. Change-Id: I82bb0daa6469930c5bf6e440c919159603d56a83 Reviewed-on: http://codereview.qt-project.org/4750 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Revert accidental v8 submodule version downgradeKent Hansen2011-09-151-0/+0
| | | | | | | | | | | | It seems as the refactor merge replaced the v8 submodule SHA1 by an older version. This commit reinstates Aaron's version from commit b57c3cc40f24277c9bab0a6811bddc79c83ad0ec Change-Id: Ie172e935561e2f6510dd81c035b17816d8da9e4b Reviewed-on: http://codereview.qt-project.org/4899 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* tests: removed semi-obsolete `maketestselftest'Rohan McGovern2011-09-157-697/+0
| | | | | | | | | | | | | | | | This test attempts to enforce various conventions onto Qt's autotests. Many of the things enforced by this test became obsolete from Qt4 -> Qt5 (because Qt5 CI is much less "magic" than Qt4 CI). The merge of `refactor' branch obsoletes even more. The remaining valuable part of this test should be moved into the `qtqa' module as a shared test, because it applies to all modules, not just qtbase. Change-Id: I2402bca32e43c597f14b8ff6ca729563ff8efbfe Reviewed-on: http://codereview.qt-project.org/4926 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>