summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Fix missing/incorrect license headersJason McDonald2011-09-157-1/+245
| | | | | | | Change-Id: I9db33c63c951f288f7a106c3008771699662d104 Reviewed-on: http://codereview.qt-project.org/4852 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix email address in license headers.Jason McDonald2011-09-1545-45/+45
| | | | | | | Change-Id: I5abf378f91a3a8f453058f36254f04258147cc15 Reviewed-on: http://codereview.qt-project.org/4851 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Add missing license headersJason McDonald2011-09-159-0/+360
| | | | | | | | | Examples get the BSD license header. Change-Id: I4802cc00815c69e2f113aa8973d61203357212e3 Reviewed-on: http://codereview.qt-project.org/4849 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix stale license headers from refactor branchJason McDonald2011-09-1524-409/+409
| | | | | | Change-Id: I38cd941202641f50bf632af35165a944d03a20e3 Reviewed-on: http://codereview.qt-project.org/4848 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Add missing license headers.Jason McDonald2011-09-152-0/+82
| | | | | | | Change-Id: I3ea0028dbf712b569ca00646098a729d3ac40717 Reviewed-on: http://codereview.qt-project.org/4379 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lasse Holmstedt
* Add a function to get all relations of an accessible.Frederik Gladhorn2011-09-152-4/+25
| | | | | | | | | | | | | | | | | Add a default implementation for RelationTo. Usually this should be empty and it is pointless to return the parent-child releations in this function. Instead we will have proper parent-child functions and also remove this functionallity from navigate. Having default implementations for these removes the necessity to reimplement them to return Unrelated in many places. Change-Id: I13b7ad3256533681e5a0548ae15da98ca0d16b94 Reviewed-on: http://codereview.qt-project.org/4785 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Ensure build_all is propagated to all modules when appropriate.Rohan McGovern2011-09-153-2/+3
| | | | | | | | | | | | If qtbase was configured to build both debug and release versions of libraries, it makes sense for any modules we are building to do the same by default. Change-Id: Idb5f78a7414b6ed2bacf295ad01f259fca435410 Reviewed-on: http://codereview.qt-project.org/4702 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* revert bogus .pro.user file additionOswald Buddenhagen2011-09-141-83/+0
| | | | | | | | | (cherry picked from commit 5c9ab15eda6a14b48120776fdc4c7c84d5771274) Change-Id: I1fdbb531304f2cb5392670a7cc457dabb2fcce63 Reviewed-on: http://codereview.qt-project.org/4826 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Use QPlaftormInputContextFactory to load input context in Wayland pluginJoona Petrell2011-09-142-0/+13
| | | | | | | Change-Id: Icd1d934463b550f0fcdf7d58df7c4fd1acb77ad8 Reviewed-on: http://codereview.qt-project.org/4740 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Add new composite Qt::ImQueryInput queryJoona Petrell2011-09-142-1/+3
| | | | | | | | | | | | | | | | When cursor position or editor text changes many input method query attributes like cursor rectangle, cursor position, surrounding text, current selection and anchor position change as well. Checking in text control and editor classes what of those related attributes have exactly changed before calling the update increases code complexity unnecessarily for a little benefit. Qt::InputMethodQueries flag can still be used to optimize more independent cases when attributes change individually, which is more common for input methods hints, fonts, platform data, maximum length or enabled attributes. Change-Id: Ic9eee5f1edb6d33ef6c01d2c9c8ad582100c0150 Reviewed-on: http://codereview.qt-project.org/4739 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix warnings received when xcb platform is ran without ibus platforminputcontextJoona Petrell2011-09-141-7/+8
| | | | | | | | | | | | | | | Warnings like QMetaObject::invokeMethod: No such method PlatformInputContext::x11FilterEvent(uint,uint,uint,bool) QMetaObject::invokeMethod: No such method PlatformInputContext::x11FilterEvent(uint,uint,uint,bool) QMetaObject::invokeMethod: No such method PlatformInputContext::x11FilterEvent(uint,uint,uint,bool) QMetaObject::invokeMethod: No such method PlatformInputContext::x11FilterEvent(uint,uint,uint,bool) Ibus is not always available and QPlatformInputContextFactory is allowed to load different input methods. Change-Id: Id498a5e024e6646e73ed4db2efe5b007e6601698 Reviewed-on: http://codereview.qt-project.org/4738 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Don't build ibus when dbus is not availablePaul Olav Tvete2011-09-141-2/+2
| | | | | | | Change-Id: I0011cae034f186f239f486f5d83635bf4d11b88d Reviewed-on: http://codereview.qt-project.org/4879 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Adjust test to the new locationLars Knoll2011-09-141-5/+5
| | | | | | | | The test got moved one level down in the directory tree, but tries to find the top level directory. Fix paths to make it work again. Change-Id: I7b80a1c6891e7f1aa013a89203f651aa3ea932e8
* disable autotests temporarily on MacLars Knoll2011-09-141-0/+2
| | | | | | Reviewed-By: Morten Change-Id: Iaf404deb3dd226212200a8716f8e7d1b70e5f40a
* added small delay after touch event is dispatchedMatthew Cattell2011-09-141-0/+1
| | | | Change-Id: Ic5682ac32e9518a293f31cd4480df061a8215746
* Windows: fixed compile of libQtPlatformSupportRohan McGovern2011-09-144-2/+19
| | | | | | | | | | | It is incorrect to use QT_GUI_EXPORT to export symbols from any library other than libQtGui. When used outside of libQtGui, QT_GUI_EXPORT attempts to _import_ symbols rather than _export_ them. Change-Id: I7489067f479edd3acd9bf08bcaa24ee4dea4c3cc Reviewed-on: http://codereview.qt-project.org/4838 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
* Windows: disable the (currently broken) Windows platform pluginRohan McGovern2011-09-141-1/+4
| | | | | | | | | | | This plugin currently refers to some API which does not exist (focusObject). It has no chance to compile for anyone. Disable it until fixed. Change-Id: I3b74b61bf5f73ba06ff73375b233a4e4ca6c1678 Reviewed-on: http://codereview.qt-project.org/4843 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* Windows: correctly disable ibus plugin on WindowsRohan McGovern2011-09-141-1/+1
| | | | | | | | | The correct qmake scope is `win32', not `win'. Change-Id: I148e764bbe94b6ca824a55458e080ca948dc304d Reviewed-on: http://codereview.qt-project.org/4844 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Removed obsolete QEXPECT_FAILJo Asplin2011-09-141-4/+0
| | | | | | | | | This QEXPECT_FAIL is obsoleted by Commit 2cca7e0884a45c3a022609b2cb4efd381ee8d5a1 Change-Id: I97bf9d8f0db50435b785bb1d2e1d60369d67aad2 Reviewed-on: http://codereview.qt-project.org/4764 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
* Temporarily disabled testsJo Asplin2011-09-143-3/+6
| | | | | | | | | | | Necessary to avoid CI blocking. The tests should be enabled again as soon as possible. Task-number: QTBUG-21424 Change-Id: Ib25da5b9a1fdb23e00a5c503db90d306deb90f06 Reviewed-on: http://codereview.qt-project.org/4768 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Holger Ihrig <holger.ihrig@nokia.com>
* Temporarily disabled testsHolger Ihrig2011-09-142-0/+2
| | | | | | | | | | | Necessary to avoid CI blocking. The tests should be enabled again as soon as possible. Task-number: QTBUG-21424 Change-Id: Ibc54723855579095be0dea3bd3e071dd22a1fccf Reviewed-on: http://codereview.qt-project.org/4825 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
* export QActionPrivate, as the Mac Cocoa plugin needs itLars Knoll2011-09-131-1/+1
| | | | Change-Id: Id193702dd4d976bf2d822616afca5e7573b5fb86
* Remove uilib and QtUiTools from QtBaseLars Knoll2011-09-13233-52574/+2
| | | | | | | The code gets moved into the qttools repository, where it belongs naturally. Change-Id: Ia50bfe212ead3365d5c3bcb24d2c5e92e2e9de8e
* Merge branch 'master' of codereview.qt-project.org:qt/qtbaseGunnar Sletta2011-09-131-1/+1
|\
| * Fix outdated license headerJason McDonald2011-09-131-1/+1
| | | | | | | | | | | | Change-Id: I5115d47b15eeba59dcc9bc5f7bf943dc9989a1a8 Reviewed-on: http://codereview.qt-project.org/4516 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* | Merge branch 'refactor'Gunnar Sletta2011-09-1311855-513777/+441255
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/qws/linux-lsb-g++/qmake.conf src/gui/image/qpixmap_mac.cpp src/gui/painting/qpaintengine_x11.cpp src/gui/painting/qtessellator.cpp src/gui/text/qfontengine_qws.cpp src/gui/text/qfontengine_x11.cpp src/gui/widgets/qlinecontrol.cpp src/opengl/qgl.h src/opengl/qgl_x11egl.cpp src/plugins/plugins.pro Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
| * make a toplevel compile workGunnar Sletta2011-09-131-1/+1
| | | | | | | | | | | | | | Change-Id: I91f35e0f8a8c66fc60cad4470704f31f5b2812ab Reviewed-on: http://codereview.qt-project.org/4725 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Holger Ihrig <holger.ihrig@nokia.com>