Samuel Rødal [Tue, 13 Sep 2011 12:02:02 +0000 (14:02 +0200)]
Fixed tst_qpixmap::grabWidget().
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>
Frederik Gladhorn [Mon, 29 Aug 2011 11:28:23 +0000 (13:28 +0200)]
Remove AccessibleEx classes.
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>
Kent Hansen [Wed, 14 Sep 2011 13:27:09 +0000 (15:27 +0200)]
Revert accidental v8 submodule version downgrade
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>
Rohan McGovern [Wed, 14 Sep 2011 23:30:22 +0000 (09:30 +1000)]
tests: removed semi-obsolete `maketestselftest'
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>
Jason McDonald [Wed, 14 Sep 2011 03:03:59 +0000 (13:03 +1000)]
Fix missing/incorrect license headers
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>
Jason McDonald [Wed, 14 Sep 2011 02:51:35 +0000 (12:51 +1000)]
Fix email address in license headers.
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>
Jason McDonald [Wed, 14 Sep 2011 02:03:34 +0000 (12:03 +1000)]
Add missing license headers
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>
Jason McDonald [Wed, 14 Sep 2011 01:55:00 +0000 (11:55 +1000)]
Fix stale license headers from refactor branch
Change-Id: I38cd941202641f50bf632af35165a944d03a20e3
Reviewed-on: http://codereview.qt-project.org/4848
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Thu, 8 Sep 2011 01:44:29 +0000 (11:44 +1000)]
Add missing license headers.
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
Frederik Gladhorn [Wed, 24 Aug 2011 14:16:14 +0000 (16:16 +0200)]
Add a function to get all relations of an accessible.
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>
Rohan McGovern [Mon, 12 Sep 2011 22:53:40 +0000 (08:53 +1000)]
Ensure build_all is propagated to all modules when appropriate.
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>
Oswald Buddenhagen [Tue, 13 Sep 2011 15:27:48 +0000 (17:27 +0200)]
revert bogus .pro.user file addition
(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>
Joona Petrell [Tue, 13 Sep 2011 08:32:41 +0000 (11:32 +0300)]
Use QPlaftormInputContextFactory to load input context in Wayland plugin
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>
Joona Petrell [Mon, 12 Sep 2011 18:54:24 +0000 (21:54 +0300)]
Add new composite Qt::ImQueryInput query
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>
Joona Petrell [Mon, 12 Sep 2011 18:20:00 +0000 (21:20 +0300)]
Fix warnings received when xcb platform is ran without ibus platforminputcontext
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>
Paul Olav Tvete [Wed, 14 Sep 2011 08:47:58 +0000 (10:47 +0200)]
Don't build ibus when dbus is not available
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>
Lars Knoll [Wed, 14 Sep 2011 12:15:54 +0000 (14:15 +0200)]
Adjust test to the new location
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
Lars Knoll [Wed, 14 Sep 2011 11:55:41 +0000 (13:55 +0200)]
disable autotests temporarily on Mac
Reviewed-By: Morten
Change-Id: Iaf404deb3dd226212200a8716f8e7d1b70e5f40a
Matthew Cattell [Tue, 13 Sep 2011 13:04:14 +0000 (15:04 +0200)]
added small delay after touch event is dispatched
Change-Id: Ic5682ac32e9518a293f31cd4480df061a8215746
Rohan McGovern [Wed, 14 Sep 2011 00:34:27 +0000 (10:34 +1000)]
Windows: fixed compile of libQtPlatformSupport
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>
Rohan McGovern [Wed, 14 Sep 2011 00:52:07 +0000 (10:52 +1000)]
Windows: disable the (currently broken) Windows platform plugin
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>
Rohan McGovern [Wed, 14 Sep 2011 00:54:11 +0000 (10:54 +1000)]
Windows: correctly disable ibus plugin on Windows
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>
Jo Asplin [Tue, 13 Sep 2011 11:26:40 +0000 (13:26 +0200)]
Removed obsolete QEXPECT_FAIL
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>
Jo Asplin [Tue, 13 Sep 2011 11:36:23 +0000 (13:36 +0200)]
Temporarily disabled tests
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>
Holger Ihrig [Tue, 13 Sep 2011 15:32:08 +0000 (17:32 +0200)]
Temporarily disabled tests
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>
Lars Knoll [Tue, 13 Sep 2011 21:27:21 +0000 (23:27 +0200)]
export QActionPrivate, as the Mac Cocoa plugin needs it
Change-Id: Id193702dd4d976bf2d822616afca5e7573b5fb86
Lars Knoll [Tue, 13 Sep 2011 12:38:26 +0000 (14:38 +0200)]
Remove uilib and QtUiTools from QtBase
The code gets moved into the qttools repository,
where it belongs naturally.
Change-Id: Ia50bfe212ead3365d5c3bcb24d2c5e92e2e9de8e
Gunnar Sletta [Tue, 13 Sep 2011 08:20:08 +0000 (10:20 +0200)]
Merge branch 'master' of codereview.qt-project.org:qt/qtbase
Gunnar Sletta [Tue, 13 Sep 2011 06:54:45 +0000 (08:54 +0200)]
Merge branch 'refactor'
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
Gunnar Sletta [Tue, 13 Sep 2011 06:08:16 +0000 (08:08 +0200)]
make a toplevel compile work
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>
Jo Asplin [Mon, 12 Sep 2011 13:17:30 +0000 (15:17 +0200)]
Disabled tests for refactor->master integration
This change disables failing tests to increase the
likelihood that 'make check' terminates with a zero
exit status. This is done to prevent the CI system
from blocking further commits once qtbase#refactor
is merged into qtbase#master.
Failing tests are marked as insignificant (by putting
'CONFIG += insignificant_test' in the .pro file).
Note: This is a temporary measure that needs to be cleaned up
once the refactor->master integration is complete.
Ideally all disabled tests need to be enabled and passing.
All changes will be marked by the string QTBUG-21402 in a comment
for easy location.
Task-number: QTBUG-21402
Change-Id: Ic4400671671f6d9b75b106a6aa4755b20e74378d
Reviewed-on: http://codereview.qt-project.org/4678
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Jason McDonald [Fri, 9 Sep 2011 08:57:10 +0000 (18:57 +1000)]
Fix outdated license header
Change-Id: I5115d47b15eeba59dcc9bc5f7bf943dc9989a1a8
Reviewed-on: http://codereview.qt-project.org/4516
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Fri, 9 Sep 2011 08:37:30 +0000 (18:37 +1000)]
Fix missing/broken license headers
Change-Id: I54f3ca5979b78f9eec8115cc580c32321859acf6
Reviewed-on: http://codereview.qt-project.org/4514
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Rohan McGovern [Mon, 12 Sep 2011 05:10:16 +0000 (15:10 +1000)]
Fixed unstable v8 compile failure in debug-and-release builds
In debug-and-release builds, the generated sources from the debug and
the release build would race with each other. This could cause the
source to be truncated during compilation, resulting in build failures
referring to undefined symbols.
Change-Id: Ib9eca2551d1e6c055a29be33ba46eab92f5b1861
Reviewed-on: http://codereview.qt-project.org/4626
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Matthew Cattell [Mon, 12 Sep 2011 15:47:37 +0000 (17:47 +0200)]
hack to allow qWaitForWindowShown to be used in test cases that use QWindow
Change-Id: Id51aaf81d898f9159e4587613f5e34c3de9a5808
Reviewed-on: http://codereview.qt-project.org/4690
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Matthew Cattell [Mon, 12 Sep 2011 15:33:42 +0000 (17:33 +0200)]
added ascii translations to qasciikey for keyup and keydown
Change-Id: I7645392b437bdaa5e981dbf07cac70ee1653b624
Reviewed-on: http://codereview.qt-project.org/4689
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Giuseppe D'Angelo [Mon, 12 Sep 2011 16:43:21 +0000 (18:43 +0200)]
Fix QNetworkReply::errorString returning an untranslated string
The QHttpNetworkConnectionPrivate::errorDetail is supposed to return a
translated string, which is then set as the QNetworkReply error.
The current code incorrectly uses QT_TRANSLATE_NOOP,
which mark the strings for translation, but does not translate them.
The result is that even with a translator loaded those strings are
written in English.
Fixes QTBUG-18382.
Merge-request: 2671
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit
434686a926a2a6e71f3cdea2508898b7800f7c81)
Change-Id: I8673cef7671d41106f50b75e78394916f3b720c9
Reviewed-on: http://codereview.qt-project.org/4691
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Oswald Buddenhagen [Fri, 9 Sep 2011 16:41:52 +0000 (18:41 +0200)]
find qt.conf more reliably
a qmake invoked with a relative path would not find qt.conf, because it
already changed CWD, which would confuse our copy of
QCoreApplication::applicationFilePath() (see also QTBUG-21381).
we already have the absolute path to the qmake executable in
Option::qmake_abslocation, so just use it.
(cherry picked from commit
c378e16e57e8ce2255116e7fdb5436524cccb8c7)
Change-Id: Icfe4254722e0855f6755b639f4c86f15bc7323ba
Reviewed-on: http://codereview.qt-project.org/4565
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
Samuel Rødal [Mon, 12 Sep 2011 12:53:20 +0000 (14:53 +0200)]
Implemented texture cache for GL paint engine in QtGui.
This is simpler than the existing texture cache in QtOpenGL, as it only
serves the GL paint engine. There's one per context group, to simplify
the design and to prevent performance degradations.
Change-Id: I61e3c9a444d8e246a8b38da019a56f2c0a533c0c
Reviewed-on: http://codereview.qt-project.org/4674
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Jan Arne Petersen [Wed, 7 Sep 2011 19:38:21 +0000 (21:38 +0200)]
Split CFLAGS from pkg-config properly
Add support for DEFINES and INCLUDEPATH to link_pkgconfig so moc uses
the cflags properly.
Task-number: QTBUG-19922
Merge-request: 2674
Reviewed-by: ossi
(cherry picked from commit
2a1e82452a192c88bcf0250f5976492f6dc3b65f)
Change-Id: I0cf543c26780ab9d6d39450435e2c1947fee3954
Reviewed-on: http://codereview.qt-project.org/4592
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Andy Shaw [Wed, 7 Sep 2011 18:40:48 +0000 (20:40 +0200)]
Ensure that the proxystyle is used over the style's own functions
When calling a style function such as pixelMetric() then this should be
done via the proxy style and not on the style directly. This is so that
the proxy style always has a chance to override the original style's
implementation and still preserve the fallback to the base style.
Task-number: QTBUG-20849
Merge-request: 2645
Reviewed-by: olivier
(cherry picked from commit
270c20490813fa943b4fbf0feb1aecb98f0b19ba)
Change-Id: Id43ec17fd1eae0136d6e1f050f23bca6d7d6d6cf
Reviewed-on: http://codereview.qt-project.org/4591
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Markku Heikkila [Wed, 7 Sep 2011 18:08:34 +0000 (20:08 +0200)]
Perl check for windows configure.
Works for Windows, *nix check is done by bash shell.
Task-number: QTBUG-5710
Merge-request: 1362
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit
b3de52be29a54aa23a446c7689a48f73206a7cbc)
Change-Id: I6c0ee22e354724c08fb4070b370254223fd5a431
Reviewed-on: http://codereview.qt-project.org/4590
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Konstantin Ritt [Wed, 7 Sep 2011 17:51:24 +0000 (19:51 +0200)]
QSettings: don't assume XDG_CONFIG_HOME is latin1-encoded
use QFile::decodeName() instead
Merge-request: 1341
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit
38b4b059e83bca2fe82a0826bdf69fd8b02b2827)
Change-Id: I8133885f7b53842d7230eeb80cf2e39a244a87d7
Reviewed-on: http://codereview.qt-project.org/4589
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Konstantin Ritt [Wed, 7 Sep 2011 17:51:23 +0000 (19:51 +0200)]
QSettings: use the common appdata dir when bootstrapping qmake on win
QSystemLibrary doesn't depend on QObject, so nothing could stop us
Merge-request: 1341
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit
4aff9e52efc7c6fc6124972efb3b381f85c45e4f)
Change-Id: I5209e6424adb5aea00baf1be6f81b286abf32906
Reviewed-on: http://codereview.qt-project.org/4588
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Andy Shaw [Mon, 22 Aug 2011 13:16:34 +0000 (15:16 +0200)]
Fix problem with grabWindow on Mac OS X 10.6 with Cocoa
For some reason the test did not fail locally but fails in the CI
system. A manual check of the images from the test shows it should
have failed. Reason for this will be investigated separately
Reviewed-by: Sergio Ahumada
(cherry picked from commit
c5f46907fbc0354aacc4bc4a6f5ab97c8b656d1a)
Change-Id: I15f09649bb37dd97401926eb5e52f33748e11ec0
Reviewed-on: http://codereview.qt-project.org/4668
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
suzuki toshiya [Wed, 7 Sep 2011 09:58:54 +0000 (11:58 +0200)]
Replace explicit surrogate handlers by inline methods of QChar class
Merge-request: 1284
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit
50af55095afe1ba048dde357b771485ef2188778)
Change-Id: I0b1967145ad62243afc2060a6ae4ca141a9609fd
Reviewed-on: http://codereview.qt-project.org/4587
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Constantin Makshin [Mon, 5 Sep 2011 17:43:00 +0000 (19:43 +0200)]
Removed the unnecessary dependency of the QtHelp module on the QtXml one
Merge-request: 2669
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit
02f55668dada4a23ab84e4d3bda1df8a4984b3ae)
Conflicts:
mkspecs/features/help.prf
tools/assistant/lib/lib.pro
Change-Id: I9702a8d2b21388906d920d577b439158f7b961d1
Reviewed-on: http://codereview.qt-project.org/4586
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Andy Shaw [Fri, 19 Aug 2011 14:15:57 +0000 (16:15 +0200)]
Fix compile issue with Mac OS X 10.5
Reviewed-by: ossi
(cherry picked from commit
a3f2ac29714744fb7a34aa7789ce89cb58c09de7)
Change-Id: I9a68e5e0316a2d38d59e7f41c412d8714e9ab178
Reviewed-on: http://codereview.qt-project.org/4584
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Andy Shaw [Fri, 19 Aug 2011 11:46:51 +0000 (13:46 +0200)]
Fix QPixmap::grabWindow() on Mac OS X Lion
The old approach was not the recommended one and although it worked on
Mac OS X 10.6 it did not work on 10.7. The new approach works correctly
on 10.6 and 10.7, so the fix is applied for both versions.
Task-number: QTBUG-19824
Merge-request: 1332
Reviewed-by: sroedal
(cherry picked from commit
aaf94776ce1034ec2b2402b9ca0e5cf7c7848b12)
Change-Id: I567d7e2ed2e4b3256f3110f4110ab1342087bc43
Reviewed-on: http://codereview.qt-project.org/4583
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Styopa Semenukha [Fri, 12 Aug 2011 19:19:26 +0000 (21:19 +0200)]
Added missing no_include_pwd check
Merge-request: 2619
Reviewed-by: ossi
(cherry picked from commit
9db6959f8893a64146124db0cfafbcb154a9e105)
Change-Id: I096013754bd78f5fcf8afcc3ae8734abc959c107
Reviewed-on: http://codereview.qt-project.org/4582
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
suzuki toshiya [Fri, 12 Aug 2011 18:22:30 +0000 (20:22 +0200)]
Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'
Merge-request: 1299
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit
81f0c44f6a4fd4cfa41af5d5b292008185bf3981)
Conflicts:
src/qt3support/itemviews/q3listbox.cpp
src/qt3support/sql/q3datatable.cpp
src/qt3support/text/q3richtext.cpp
src/scripttools/debugging/qscriptcompletiontask.cpp
src/scripttools/debugging/qscriptdebuggercodeview.cpp
Change-Id: Ie70590e77e69fbb9b2322c48c3963fd9cbba19e6
Reviewed-on: http://codereview.qt-project.org/4581
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Holger Hans Peter Freyther [Fri, 12 Aug 2011 17:05:47 +0000 (19:05 +0200)]
directfb: Include directfbgl.h directly
directfb.h is included directly in all other files, include
directfbgl.h without the directfb/ prefix as well.
$ pkg-config --cflags directfb
-D_REENTRANT -I/home/foo/install/directfb/include/directfb
Merge-request: 2643
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit
647ffa677f9bf6da50fcdb7a6948501e7e6719ce)
Change-Id: If96f378a95e7790132e89f934341977520367018
Reviewed-on: http://codereview.qt-project.org/4579
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Ritt Konstantin [Wed, 13 Jul 2011 16:14:39 +0000 (18:14 +0200)]
don't detach until the list is going to be modified
removeAt() does detach()'ing for us
Merge-request: 1285
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit
52223d80ec8ba6d579c091efe0e40589a5d2bd67)
Change-Id: I78865e19f989d9079c8dee47b8cf1bdf7e5db261
Reviewed-on: http://codereview.qt-project.org/4578
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Ritt Konstantin [Wed, 13 Jul 2011 16:14:38 +0000 (18:14 +0200)]
optimize QList::removeAll()
a) don't detach until an occurrence found
b) don't memmove every time an occurrence found
c) truncate quickly )
well, numbers are better than words:
before:
RESULT : tst_QList::removeAll_primitive():
2,617,902 CPU ticks per iteration (total: 261,790,171, iterations: 100)
RESULT : tst_QList::removeAll_movable():
2,547,540 CPU ticks per iteration (total: 254,753,960, iterations: 100)
RESULT : tst_QList::removeAll_complex():
16,852,099 CPU ticks per iteration (total: 1,685,209,906, iterations: 100)
after:
RESULT : tst_QList::removeAll_primitive():
73,520 CPU ticks per iteration (total: 73,520,442, iterations: 1000)
RESULT : tst_QList::removeAll_movable():
90,422 CPU ticks per iteration (total: 90,422,464, iterations: 1000)
RESULT : tst_QList::removeAll_complex():
9,667,073 CPU ticks per iteration (total: 9,667,072,670, iterations: 1000)
Merge-request: 1285
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit
b209fe3b1a51f64541067917e96de99f14ad65f3)
Change-Id: Ia26036ed741cefcf4b5868b7b2fc5eae8130d3dc
Reviewed-on: http://codereview.qt-project.org/4577
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Viktor Kolesnyk [Fri, 12 Aug 2011 16:32:41 +0000 (18:32 +0200)]
Missed break of switch-case added
Merge-request: 2642
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit
762a9ba066db3b31a4b3c0c2fc01d545b93348fc)
Change-Id: Iba88cf117d4e3dde4fe07bfdfb7e2af25aa25e8d
Reviewed-on: http://codereview.qt-project.org/4576
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Mark Brand [Fri, 8 Jul 2011 16:52:36 +0000 (18:52 +0200)]
sync win32-g++-cross with win32-g++ (lib prefix and extension)
qmake now needs library prefix and extension to be supplied. This was
added to plain win32-g++ in dbbf06e. Now added to win32-g++-cross.
Without this, static libraries get named 'X.lib' instead of 'libX.a'.
Merge-request: 1283
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit
8ce9dc02cd5031f26c7fec10484a8c47904c46f5)
Change-Id: Ic12f655bcfc8a422a98819904ec796d896de77f5
Reviewed-on: http://codereview.qt-project.org/4575
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Oswald Buddenhagen [Fri, 24 Jun 2011 14:00:19 +0000 (16:00 +0200)]
qsystemlibrary needs no special treatment
this was just a merge artifact
(cherry picked from commit
4ac87b7042f7b08e8b427e21d74aa8d224b186bc)
Change-Id: Ifa0638982fe48fda2e8d9aa7ee43029187330f02
Reviewed-on: http://codereview.qt-project.org/4574
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Bernhard Rosenkraenzer [Fri, 10 Jun 2011 16:08:44 +0000 (18:08 +0200)]
Fix building the OpenVG graphicssystem on Linux with static libs
Without this, building OpenVG would fail because Q_OPENVG_EXPORT wasn't
defined at all, causing it to be treated as a variable name
Merge-request: 1256
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit
8680ced782c5e225b2e15c50c05493a23410b119)
Change-Id: I0da36af8cdcf411325fad25fa5c4d2ab7764c0ee
Reviewed-on: http://codereview.qt-project.org/4573
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Oswald Buddenhagen [Fri, 13 May 2011 09:54:13 +0000 (11:54 +0200)]
update gitignore
(cherry picked from commit
ba564e089134980200c1c71879f2474135bee5fa)
Change-Id: Id3a83228d178cefbec21b07f7e6439e3ea92b962
Reviewed-on: http://codereview.qt-project.org/4572
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Oswald Buddenhagen [Fri, 13 May 2011 08:20:19 +0000 (10:20 +0200)]
remove -fno-stack-protector
there is no need to disable stack protector unless one uses an ancient
version of gcc.
taken from kubuntu.
(cherry picked from commit
30211e6847007bf375f60f62f5806b05cec810c3)
Change-Id: Idd74823176a63002cc0f6511adc6a981bef79df9
Reviewed-on: http://codereview.qt-project.org/4571
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Anders Bakken [Tue, 10 May 2011 18:39:35 +0000 (11:39 -0700)]
Fix make confclean
Merge-request: 1227
Reviewed-by: ossi
(cherry-picked from commit
792b4b500ab740f89db5586791105ff13778b87f)
Change-Id: Id5ec2cfb228691c8483bf1d9e0c6a763aa649217
Reviewed-on: http://codereview.qt-project.org/4570
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Michał Zając [Fri, 13 May 2011 08:39:34 +0000 (10:39 +0200)]
Retain ABI and API compatibility when Qt is built with EGL.
Author: Felix Geyer <debfx-pkg@fobos.de>
Merge-request: 1230
Reviewed-by: ossi
(cherry picked from commit
dcbd920daf92d80302633f73dd8324437005a10e)
Change-Id: I8d2dc64a2785b4940d06c9493a3ba0f96a487f9b
Reviewed-on: http://codereview.qt-project.org/4569
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Bernhard Rosenkraenzer [Mon, 9 May 2011 09:34:23 +0000 (11:34 +0200)]
Fix -no-gui
-no-gui still tried to build the graphicssystem and inputmethod
plugins, both of which require QtGui
Merge-request: 1215
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit
f0ae4f8ebdc6b7c50c163cfa29e686f3f87c8ba5)
Conflicts:
src/plugins/plugins.pro
Change-Id: I74ced5817989604f3beebf1fcc60eabaf1fd8115
Reviewed-on: http://codereview.qt-project.org/4568
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Tasuku Suzuki [Mon, 2 May 2011 09:23:47 +0000 (11:23 +0200)]
Fix compilation with QT_NO_*
Merge-request: 1206
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit
eb61f612fea1b76fe01ee237e5bd160f66aeca3d)
Conflicts:
src/declarative/debugger/qdeclarativedebugserver.cpp
Change-Id: I8ff647b1e331b0c855a8f63d16a4f3cacd8e436c
Reviewed-on: http://codereview.qt-project.org/4567
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Samuel Rødal [Mon, 12 Sep 2011 11:01:30 +0000 (13:01 +0200)]
Added new QOpenGLPaintDevice test case in tst_QOpenGL.
Change-Id: Ic56e4c236f52fbd5c570bb647d5d1f4e5f9e7924
Reviewed-on: http://codereview.qt-project.org/4662
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Lars Knoll [Mon, 12 Sep 2011 11:40:58 +0000 (13:40 +0200)]
Fix compilation
Change-Id: I0b562f810bc12e728f59976ad8467a5ce9fd9bec
Reviewed-on: http://codereview.qt-project.org/4666
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Samuel Rødal [Mon, 12 Sep 2011 11:00:30 +0000 (13:00 +0200)]
Fixed auto-test failure in tst_QOpenGL.
QOpenGLFramebufferObject::height() was returning the width...
Change-Id: I521c2df02e00015998dc31a74481113af26e1ba6
Reviewed-on: http://codereview.qt-project.org/4663
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Samuel Rødal [Mon, 12 Sep 2011 08:43:13 +0000 (10:43 +0200)]
Fixed race condition in xcb plugin logging (when debugging is enabled).
Change-Id: I8fa11ba26037d8f78e7c5131326d94836d0de9d4
Reviewed-on: http://codereview.qt-project.org/4647
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Holger Ihrig [Mon, 12 Sep 2011 10:51:05 +0000 (12:51 +0200)]
Compile fix for QPA
Change-Id: I26842fc754d671051ae406d9c03982bb1db8a3a7
Reviewed-on: http://codereview.qt-project.org/4660
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Konstantin Ritt [Tue, 30 Aug 2011 08:34:31 +0000 (12:34 +0400)]
don't crash when destroying the shortcuts
as shortcutDestroyed(..) modifies the shortcuts list.
disconnect from shortcutDestroyed() first, or operate on a detach()-ed list
this was uncovered by QList::removaAll() optimization patch.
(cherry picked from commit
e95de30977291a251660f72baa84b5ff244711fb)
Change-Id: Ie0b371c54458ce85f4d36430de8080a5e78d8b7f
Reviewed-on: http://codereview.qt-project.org/4585
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Oswald Buddenhagen [Mon, 15 Aug 2011 16:10:02 +0000 (18:10 +0200)]
don't crash when destroying codec list
this was uncovered by rittk's don't-detach patch.
(cherry picked from commit
cc98710df73a590c37dca19bd3aa9fcd9bbd5a92)
Change-Id: I2225e6a94e5562459d9c5fd27ac7c8e611b674fd
Reviewed-on: http://codereview.qt-project.org/4580
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Jo Asplin [Mon, 12 Sep 2011 10:02:19 +0000 (12:02 +0200)]
Disambiguated access to QTestLib API
Commit
2cca7e0884a45c3a022609b2cb4efd381ee8d5a1 overloads
QTestLib so that QWindow * can be passed directly to
certain functions.
This fix disambiguates access to the new API by selecting
the QWindow * versions. This assumes that the QWidget *
versions are kept mostly for backwards compatibility.
Change-Id: I075196d86d8d1d38f7192dace3c3892d315bf671
Reviewed-on: http://codereview.qt-project.org/4655
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
Jo Asplin [Mon, 12 Sep 2011 08:01:56 +0000 (10:01 +0200)]
Disambiguated access to QTestLib API
Commit
2cca7e0884a45c3a022609b2cb4efd381ee8d5a1 overloads
QTestLib so that QWindow * can be passed directly to
certain functions.
This fix disambiguates access to the new API by selecting
the QWindow * versions. This assumes that the QWidget *
versions are kept mostly for backwards compatibility.
Change-Id: I8755c86d5ebeb275dfa9162b0168d9179a61982d
Reviewed-on: http://codereview.qt-project.org/4640
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
Jo Asplin [Mon, 12 Sep 2011 07:28:19 +0000 (09:28 +0200)]
Add other.pro back to auto.pro
The other/ subdirectory should still be built via other.pro.
This was overlooked by Commit
0a208dd4135fc16d05f9fd8c417d99e3f39c39fb
Task-number: QTBUG-21327
Change-Id: Ie8ebd7dfc5b1dd56ca1b629aa011d160cb563ddd
Reviewed-on: http://codereview.qt-project.org/4526
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jo Asplin [Mon, 12 Sep 2011 07:21:12 +0000 (09:21 +0200)]
Moved autotests in category 'tools' into new directory structure
Task-number: QTBUG-21355
Change-Id: I315d4b1f55d42391524c0e8625952dee1b96fca3
Reviewed-on: http://codereview.qt-project.org/4449
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Samuel Rødal [Mon, 12 Sep 2011 07:52:03 +0000 (09:52 +0200)]
Fix crash in QPlatformInputContextFactory.
If ic is null we shouldn't dereference it.
Change-Id: Idf472c799f8207d893f15a55fac330ea20ec451c
Reviewed-on: http://codereview.qt-project.org/4639
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Takumi ASAKI [Fri, 9 Sep 2011 15:34:42 +0000 (17:34 +0200)]
Modify mkspecs/unsupported/macx-clang/qplatformdefs.h
Now mkspecs/unsupported/macx-clang/qplatformdefs.h includes
mkspecs/common/mac/qplatformdefs.h.
This patch fixes that Qt built with clang failes to load cocoa platform
plugin without QT_QPA_PLATFORM environment variable.
Change-Id: Id48268eaf7ba24403f91497539ef0dab6f22a9dc
Reviewed-on: http://codereview.qt-project.org/4564
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Gunnar Sletta [Sat, 10 Sep 2011 08:24:19 +0000 (10:24 +0200)]
don't build ibus plugin on windows/mac
Change-Id: I932eaea19806e3ce75803cb2849d04292885fbd5
Reviewed-on: http://codereview.qt-project.org/4631
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Gunnar Sletta [Sat, 10 Sep 2011 07:57:39 +0000 (09:57 +0200)]
Made FBO blit behave properly
Change-Id: Iad9b9823bbcdf1068455f743e5fbc554939f8592
Reviewed-on: http://codereview.qt-project.org/4630
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Gunnar Sletta [Fri, 9 Sep 2011 18:15:40 +0000 (20:15 +0200)]
Use the context we're given
Change-Id: I5bdcd1baf1bff86d281664c219098fe841b43fce
Reviewed-on: http://codereview.qt-project.org/4629
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Jo Asplin [Fri, 9 Sep 2011 07:57:55 +0000 (09:57 +0200)]
Moved autotests in category 'testlib' into new directory structure
Task-number: QTBUG-21353
Change-Id: I2e2ad4b7570f80b3e6500821f769e967f0a75027
Reviewed-on: http://codereview.qt-project.org/4438
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Gunnar Sletta [Mon, 12 Sep 2011 05:49:03 +0000 (07:49 +0200)]
Merge branch 'master' into refactor
Conflicts:
src/3rdparty/v8
src/gui/text/qfont_qpa.cpp
src/gui/widgets/qlinecontrol.cpp
src/plugins/platforms/fontdatabases/fontconfig/qfontconfigdatabase.cpp
tests/auto/gui.pro
tests/auto/network.pro
tests/auto/qstring/tst_qstring.cpp
Change-Id: Id118c172645303ccf06a207050d5bf1462ff57fe
Kent Hansen [Fri, 9 Sep 2011 10:25:32 +0000 (12:25 +0200)]
configure on Windows: Store result of V8 configuration
Otherwise V8 won't be built (there's a contains()
check in src.pro).
Change-Id: Iba65e85baae1e80800e5ca0da49fde8958dfd659
Reviewed-on: http://codereview.qt-project.org/4524
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Jo Asplin [Fri, 9 Sep 2011 12:35:13 +0000 (14:35 +0200)]
Fixed build error in tst_qopengl
QOpenGLFramebufferObject must be wrapped in a QOpenGLPaintDevice
before being passed to QPainter::begin().
Change-Id: Ic82f8f17b2ea18a3790de7e75f0dd6c9092528ed
Reviewed-on: http://codereview.qt-project.org/4541
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Takumi ASAKI [Fri, 9 Sep 2011 10:56:23 +0000 (12:56 +0200)]
Clang Build Fix: Cocoa platform plugin
Fix some assignment from const values to non-const without cast.
Move #import to avoid compile error.
Fix type mismatch.
Change-Id: I93ae5cd07827b92a91093df979992616b26b14af
Reviewed-on: http://codereview.qt-project.org/4536
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Matthew Cattell [Fri, 9 Sep 2011 12:37:26 +0000 (14:37 +0200)]
added additional qwindow test support functions for keyboard and mouse events
Change-Id: Id5be7053c917bcefb2bb8cfab58de0933baf15d3
Reviewed-on: http://codereview.qt-project.org/4540
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Jiang Jiang [Thu, 8 Sep 2011 15:38:56 +0000 (17:38 +0200)]
Fix a few memory leaks for QFontconfigDatabase
Change-Id: I015a9287f03d6965a77461d3e894de0492547cf3
Reviewed-on: http://codereview.qt-project.org/4480
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Jo Asplin [Thu, 8 Sep 2011 13:12:01 +0000 (15:12 +0200)]
Moved autotests in category 'opengl' into new directory structure
Task-number: QTBUG-21356
Change-Id: I496680aa670af3409e50e1c254ef2c557b414d33
Reviewed-on: http://codereview.qt-project.org/4452
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jo Asplin [Wed, 7 Sep 2011 08:58:35 +0000 (10:58 +0200)]
Moved autotests in category 'other' into new directory structure
Task-number: QTBUG-21327
Change-Id: I296063b665809e0411a7546fc9b41a287317ecb7
Reviewed-on: http://codereview.qt-project.org/4326
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jo Asplin [Tue, 6 Sep 2011 11:46:40 +0000 (13:46 +0200)]
Moved network autotests into new directory structure
Task-number: QTBUG-21223
Change-Id: I55dbf5c42a1c5d938b9e0c9bf7d90457a6c26bbc
Reviewed-on: http://codereview.qt-project.org/4259
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Gunnar Sletta [Fri, 9 Sep 2011 07:03:12 +0000 (09:03 +0200)]
use QtGui/ based includes
Change-Id: I763bdba236aef25685d9d0fa2e02741c2f5c141e
Reviewed-on: http://codereview.qt-project.org/4507
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Aaron Kennedy [Fri, 9 Sep 2011 04:20:18 +0000 (14:20 +1000)]
Update V8
Add a "NativeMode" to V8 script compilation.
Change-Id: I73b087c9787ca7f961c2af89f45de2b8813ce1a5
Task-number: QTBUG-20344
Reviewed-on: http://codereview.qt-project.org/4500
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Rohan McGovern [Thu, 8 Sep 2011 05:18:42 +0000 (15:18 +1000)]
tests: use contains(QT_CONFIG,private_tests) consistently
These tests used requires(contains(QT_CONFIG,private_tests)) in their
.pro file, but did not subtract themselves from their parent project
SUBDIRS when private_tests weren't enabled.
In the best case, this wastes a little time as qmake iterates over these
projects which won't be built. In some worse esoteric cases, this may
break compilation or packaging.
Change-Id: I189c108ee9943b15114becf9d6b04f78dbabbe31
Reviewed-on: http://codereview.qt-project.org/4389
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Lars Knoll [Thu, 8 Sep 2011 20:09:33 +0000 (22:09 +0200)]
Make inputcontext plugin loading a bit more generic
Add a create() method to the inputcontext factory that
takes no arguments.
Add a virtual isValid() to QPlatformInputContext to
determine whether it actually works.
Remove IBUS dependencies in the xcb code so that it
can also load other plugins.
Change-Id: I6345a845f48fd4b3cacf6d8652711b16835a235c
Reviewed-on: http://codereview.qt-project.org/4487
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Lars Knoll [Thu, 8 Sep 2011 19:43:36 +0000 (21:43 +0200)]
Fixup a few minor errors in the previous commit
Methods need to be Q_INVOKABLE to be able to call
them with QMetaObject::invokeMethod(). Also use the
correct return type.
This makes the IBUS input context work again.
Change-Id: If7ed6dd8fb99f3363c4ecebb98f889ed9eeeff00
Reviewed-on: http://codereview.qt-project.org/4486
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Joona Petrell [Thu, 8 Sep 2011 14:22:55 +0000 (17:22 +0300)]
Add plugin mechanism to load platform input contexts
Change-Id: I6e74fd395325445420efce4adf13e89abe8177ee
Reviewed-on: http://codereview.qt-project.org/4482
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Joerg Bornemann [Thu, 8 Sep 2011 15:44:05 +0000 (17:44 +0200)]
qmake vcxproj generator: fix XML conversion for build events
Task-number: QTBUG-20419
Change-Id: I52069e0beb2b39ec4a67e83de583efd2926c6611
Reviewed-on: http://codereview.qt-project.org/4484
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Thiago Macieira [Wed, 22 Dec 2010 18:52:48 +0000 (19:52 +0100)]
Add an SSE4.2 even simpler version of toLatin1
Use the new PCMPESTRM instruction (Parallel CoMPare Explicit-length
STRings with result in a Mask) which is added in SSE4.2 for
facilitating string operations. The "compare ranges" mode allows us to
search for characters outside the Latin 1 range and then use the
SSE4.1 PBLENDVB instruction to replace those with question marks.
Unlike previous SSE compare instructions, the PCMPxSTRx family allows
us to operate on unsigned 16-bit values. This saves us another
parallel add.
Reviewed-By: Samuel Rødal
(cherry picked from commit
45d2d36c9dbcbce403c78838ea52acd1ab111b68)
Change-Id: I0f9d864f9d19c0f0da43ccb6918dc28295074496
Reviewed-on: http://codereview.qt-project.org/4468
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Thiago Macieira [Wed, 22 Dec 2010 18:52:18 +0000 (19:52 +0100)]
Create a function that merges the SSE common code
Reviewed-by: Samuel Rødal
(cherry picked from commit
bb3bd601560132df769c32808ae0b36c56d1caab)
Change-Id: Icd7f661785a793effcd4d8cd08ffa8bb5a592cd9
Reviewed-on: http://codereview.qt-project.org/4467
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Thiago Macieira [Wed, 22 Dec 2010 13:42:33 +0000 (14:42 +0100)]
Improve toLatin1 x86 SIMD by using a new SSE4.1 instruction
The new instruction is PBLENDVB, which creates a result by selecting
bytes from one of two registers, depending on whether the mask
contains a 1 (0xff) or a zero.
The SSE2 code requires three instructions (and, andnot, or).
The equivalent Neon instruction is VBSL (bit select).
Reviewed-by: Samuel Rødal
(cherry picked from commit
bdad106358ae177d1345f5ff85c0e38cfeb5ca90)
Change-Id: I5b0d055a4be532f81c6f11181d710525cd6c3f25
Reviewed-on: http://codereview.qt-project.org/4466
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>