Jason McDonald [Fri, 18 Nov 2011 00:19:11 +0000 (10:19 +1000)]
Remove obsolete comment from QDataStream test.
The removed comment was introduced before the tests were imported into
the Qt repository in 2006 and seems to relate to code that no longer
exists.
Change-Id: Ic21e46fe0157adf5be9dc62de098517b7b27c310
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Thu, 17 Nov 2011 06:11:59 +0000 (16:11 +1000)]
Improve QBuffer autotest.
This commit fixes several issues found in the readLineBoundaries() test
function.
First, the test performed some test actions but did not perform any
verification steps to check that the outcome of those actions was
acceptable.
Second, the test didn't need to write the buffered data to a file to
verify line-by-line reading.
Third, the get/unget action was unrelated to the readLineBoundaries()
test and has been moved to a separate test function. That test function
now tests that get/unget works at every position in a buffer, not just
at position 0.
Change-Id: Icad52ed598e94b6e05a194b9ab301d099bfc094c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Rohan McGovern [Fri, 18 Nov 2011 01:49:45 +0000 (11:49 +1000)]
Fixed crashes from tests using xcb plugin with -qtnamespace.
Use QT_BEGIN_NAMESPACE/QT_END_NAMESPACE consistently in xcb plugin.
Some, but not all, of the sources were already using QT_BEGIN_NAMESPACE.
Change-Id: I23b83cc88870fd4039437b733084ab86dd807356
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Rohan McGovern [Fri, 18 Nov 2011 01:49:45 +0000 (11:49 +1000)]
Fixed crashes from tests using xcb plugin with -qtnamespace.
Use QT_BEGIN_NAMESPACE/QT_END_NAMESPACE consistently in xcb plugin.
Some, but not all, of the sources were already using QT_BEGIN_NAMESPACE.
Change-Id: I23b83cc88870fd4039437b733084ab86dd807356
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Jason McDonald [Tue, 15 Nov 2011 01:36:18 +0000 (11:36 +1000)]
Don't depend on moc to disable test functions.
The moc tool is not aware of all defines (particularly those that are
compiler builtins) and does not correctly evaluate others that depend
on compiler builtins, such as Q_OS_FOO.
This commit reverts parts of the following commits, but is not a
complete fix as there were many instances of this problem in the tests
prior to those commits:
924d810dbdcd5b5b0fa860922b2487ea9062d002
8aaff6751038b88d17e23be6fcee945771297c5b
338d3f11973412047c2c9cd41cbd0c961d738ef3
a55034062ba2bf73a9f1ed3d9cf31745b38149e3
253497b7446c7d723aa3bdd7152e25d6852f2604
7cfad460c56319ba89c4a3a0bbcb2e54ab1cdbc6
9d2ff58f3642828e494e7e9b2df7dbb8e2cd408f
0cf6baa2d61ebaad2a2a0530c37f27e719b68f4b
Change-Id: I947d797fe3ec76139ba1b55561cea569895662c5
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Rohan McGovern [Thu, 17 Nov 2011 23:22:20 +0000 (09:22 +1000)]
configure: clean up whitespace, comments.
Make the indentation sensible.
Remove comments which merely repeat the name of a variable on the next
line.
Change-Id: Ic3ecaaaba61795aeee10299ee44523eb725ecad9
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Rohan McGovern [Thu, 17 Nov 2011 23:22:20 +0000 (09:22 +1000)]
configure: clean up whitespace, comments.
Make the indentation sensible.
Remove comments which merely repeat the name of a variable on the next
line.
Change-Id: Ic3ecaaaba61795aeee10299ee44523eb725ecad9
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Jason McDonald [Tue, 15 Nov 2011 01:36:18 +0000 (11:36 +1000)]
Don't depend on moc to disable test functions.
The moc tool is not aware of all defines (particularly those that are
compiler builtins) and does not correctly evaluate others that depend
on compiler builtins, such as Q_OS_FOO.
This commit reverts parts of the following commits, but is not a
complete fix as there were many instances of this problem in the tests
prior to those commits:
924d810dbdcd5b5b0fa860922b2487ea9062d002
8aaff6751038b88d17e23be6fcee945771297c5b
338d3f11973412047c2c9cd41cbd0c961d738ef3
a55034062ba2bf73a9f1ed3d9cf31745b38149e3
253497b7446c7d723aa3bdd7152e25d6852f2604
7cfad460c56319ba89c4a3a0bbcb2e54ab1cdbc6
9d2ff58f3642828e494e7e9b2df7dbb8e2cd408f
0cf6baa2d61ebaad2a2a0530c37f27e719b68f4b
Change-Id: I947d797fe3ec76139ba1b55561cea569895662c5
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Rohan McGovern [Thu, 17 Nov 2011 22:48:07 +0000 (08:48 +1000)]
Fixed compile of autotests with -qtnamespace.
Make sure to use the Qt namespace for qGlobalPostedEventsCount.
Change-Id: I558a0b0fba1e22a2edd96f9499a2bab82046c4a4
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Rohan McGovern [Thu, 17 Nov 2011 22:48:07 +0000 (08:48 +1000)]
Fixed compile of autotests with -qtnamespace.
Make sure to use the Qt namespace for qGlobalPostedEventsCount.
Change-Id: I558a0b0fba1e22a2edd96f9499a2bab82046c4a4
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Kent Hansen [Thu, 17 Nov 2011 15:06:27 +0000 (16:06 +0100)]
Call invalidateResource() on QOpenGLMultiGroupSharedResource-owned resources
Commit
202127f860208c21145e05685bc54219e1655dbd ensured that
QOpenGLMultiGroupSharedResource-owned resources are deleted,
but it was missing a call to invalidateResource().
Change-Id: I166ce8a7298772408081331fe1a91bd2cd88aebb
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Kai Koehne [Thu, 17 Nov 2011 15:33:41 +0000 (16:33 +0100)]
Update V8
Change-Id: Ie6157e0baa55271707b3e00ed80b67ab79f4f570
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Kai Koehne [Thu, 17 Nov 2011 15:33:41 +0000 (16:33 +0100)]
Update V8
Change-Id: Ie6157e0baa55271707b3e00ed80b67ab79f4f570
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Kent Hansen [Thu, 17 Nov 2011 15:06:27 +0000 (16:06 +0100)]
Call invalidateResource() on QOpenGLMultiGroupSharedResource-owned resources
Commit
202127f860208c21145e05685bc54219e1655dbd ensured that
QOpenGLMultiGroupSharedResource-owned resources are deleted,
but it was missing a call to invalidateResource().
Change-Id: I166ce8a7298772408081331fe1a91bd2cd88aebb
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Olivier Goffart [Wed, 16 Nov 2011 08:07:24 +0000 (09:07 +0100)]
Fix tst_Moc::oldStyleCasts
This tests that the moc generated file produces no warnings with very
pedentic compilation flags.
In that case, there was a warning because of the use of the C casts
Change-Id: Ie79c6d053ff35c55276a07212c5d60f759f693ee
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Olivier Goffart [Wed, 16 Nov 2011 08:07:24 +0000 (09:07 +0100)]
Fix tst_Moc::oldStyleCasts
This tests that the moc generated file produces no warnings with very
pedentic compilation flags.
In that case, there was a warning because of the use of the C casts
Change-Id: Ie79c6d053ff35c55276a07212c5d60f759f693ee
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Jędrzej Nowacki [Mon, 7 Nov 2011 13:23:05 +0000 (14:23 +0100)]
Reimplement QMetaType::typeName.
New implementation is slightly faster (~30%) and it is not dependent
on order of definitions in QMetType::Type. Which means that we do not
have to maintain a separate type list.
Change-Id: I0ceb8c919c08afaa55146fbc3f021b78ffc2c063
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Jędrzej Nowacki [Tue, 1 Nov 2011 11:58:42 +0000 (12:58 +0100)]
Reimplement some QMetaType methods.
Methods of QMetaType; sizeOf, construct and destruct were reimplement
using QMetaTypeSwitcher. The change should have impact only on
maintenance (by removing 3 type switches).
Change-Id: Iac3eb52de75d46f12ac32f229a26aec5b5bc7af2
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Pierre Rossi [Wed, 16 Nov 2011 15:45:28 +0000 (16:45 +0100)]
Fix sliders style issues.
Due to their widget heritage,some styles' logic for drawing sliders
incorrectly assumed a rect with a top left point at (0,0).
Change-Id: I02d9c32d925650ccb36e2b917dd890e5d2bbf925
Reviewed-by: Jens Bache-Wiig
Pierre Rossi [Wed, 16 Nov 2011 15:45:28 +0000 (16:45 +0100)]
Fix sliders style issues.
Due to their widget heritage,some styles' logic for drawing sliders
incorrectly assumed a rect with a top left point at (0,0).
Change-Id: I02d9c32d925650ccb36e2b917dd890e5d2bbf925
Reviewed-by: Jens Bache-Wiig
Jędrzej Nowacki [Tue, 1 Nov 2011 11:58:42 +0000 (12:58 +0100)]
Reimplement some QMetaType methods.
Methods of QMetaType; sizeOf, construct and destruct were reimplement
using QMetaTypeSwitcher. The change should have impact only on
maintenance (by removing 3 type switches).
Change-Id: Iac3eb52de75d46f12ac32f229a26aec5b5bc7af2
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Jędrzej Nowacki [Mon, 7 Nov 2011 13:23:05 +0000 (14:23 +0100)]
Reimplement QMetaType::typeName.
New implementation is slightly faster (~30%) and it is not dependent
on order of definitions in QMetType::Type. Which means that we do not
have to maintain a separate type list.
Change-Id: I0ceb8c919c08afaa55146fbc3f021b78ffc2c063
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Richard Moore [Tue, 15 Nov 2011 21:58:05 +0000 (21:58 +0000)]
Improve the testability of QSslOptions.
The handling of QSslOptions is complicated not only by the subject, but
also by the fact that some of the openssl directives are negatives. This
commit tries to separate the inherent complexity from the complexity of
the api by allowing us to test them independently.
Change-Id: Ieb9386c69dd9b0b49dc42e26b2878a301f26ded1
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Richard Moore [Tue, 15 Nov 2011 21:58:05 +0000 (21:58 +0000)]
Improve the testability of QSslOptions.
The handling of QSslOptions is complicated not only by the subject, but
also by the fact that some of the openssl directives are negatives. This
commit tries to separate the inherent complexity from the complexity of
the api by allowing us to test them independently.
Change-Id: Ieb9386c69dd9b0b49dc42e26b2878a301f26ded1
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Rohan McGovern [Thu, 17 Nov 2011 07:47:01 +0000 (17:47 +1000)]
Fixed compile of QtPlatformSupport with -qtnamespace.
Change-Id: Iba411d35abe85ecf29a44d99113954a0561ae286
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
Rohan McGovern [Thu, 17 Nov 2011 07:39:52 +0000 (17:39 +1000)]
Fixed compile of QtGui with -qtnamespace.
GL headers should not be included inside of the Qt namespace.
Change-Id: Ib19cbd3ab7b071a96e0816798f8ebc3fd4e28448
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
Friedemann Kleint [Thu, 17 Nov 2011 09:49:42 +0000 (10:49 +0100)]
Fix compilation with -force-asserts.
Change-Id: I2f697ba9ab9a5a8393e778abad4da18c7f232d7f
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
Friedemann Kleint [Thu, 17 Nov 2011 09:44:31 +0000 (10:44 +0100)]
Windows: Rebuild configure with support for V8 and -force-asserts.
Change-Id: I52f4c842f0604d14a0fed8ebdc7a33938d977ec4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Friedemann Kleint [Thu, 17 Nov 2011 09:37:24 +0000 (10:37 +0100)]
Windows: Add -force-asserts to configure.exe
Change-Id: I678011f0e60d74a1b2d63a18570778e1f686f123
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
Jason McDonald [Thu, 17 Nov 2011 03:44:53 +0000 (13:44 +1000)]
Remove commented code from QBuffer autotest.
The removed code was commented-out before the tests were imported into
the Qt repository in June 2006. This code is no longer valid as the
warning messages it relates to are not produced by any code in qtbase.
Change-Id: Iac63b27387b51a71c567386ca61faf5fb00c3364
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Thu, 17 Nov 2011 03:29:36 +0000 (13:29 +1000)]
Improve Q_FUNC_INFO autotest.
The availableWithoutDebug() test was trying to force QT_NO_DEBUG to be
defined, but was actually doing the opposite. While I'm not satisfied
with the way this test works (it would be better to test with
QT_NO_DEBUG already defined when Q_FUNC_INFO is included). at least this
test now does what it says it does.
Additionally, the test has been improved by checking that Q_FUNC_INFO
returns a non-empty string, as opposed to just compiling.
Change-Id: I9175e3a7406152b6250b507a61b5062e3cfabeb8
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Bradley T. Hughes [Mon, 14 Nov 2011 13:43:32 +0000 (14:43 +0100)]
Build all tests on Mac OS X, but do not run them yet.
Previously, autotests and benchmarks were disabled on Mac OS X. This is
wrong, and needs to be corrected. The 'make check' target is disabled
for the autotests on Mac OS X for now, but all tests will now be built.
The check target does not actually run the benchmarks, so this can be
safely re-enabled without breaking the CI system.
There will be commits to follow which re-enable the 'make check' target
on Mac OS X for each module.
Change-Id: I1347da46e3688b48e8cc5d933ee5188ea3723639
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Alberto Mardegan [Fri, 11 Nov 2011 11:10:22 +0000 (12:10 +0100)]
Don't directly access QList contents
The existing code doesn't work on 64bit machines. We must first convert
the list into a QVector, which guarantees that elements are laid out
correctly as an array.
Merge-request: 1467
Reviewed-by: thiago
(cherry picked from commit
00020eed3fa948f69cfa776e92121edec6f975cc)
Change-Id: I00020eed3fa948f69cfa776e92121edec6f975cc
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Tor Arne Vestbø [Mon, 14 Nov 2011 12:18:08 +0000 (13:18 +0100)]
Allow overriding the output dir when running syncqt
This feature is only available to advanced qmake clients who have their
own defaults_pre.prf, where QMAKE_SYNCQT_OUTDIR is set before loading
Qt's own default_pre.
This is useful to be able to put the sync.profile file in a different
level in the source tree than where you want the output in the build
tree.
An alternate/complimenting solution would be to allow the output path
to be overriden from within the sync.profile file.
Change-Id: I3cdef82dbe492877507e269e18571456beeb2b7d
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Harald Fernengel [Wed, 16 Nov 2011 10:56:48 +0000 (11:56 +0100)]
Revert logic when building with --force-asserts
This reverts commit
f109f5b8a9c7e6939dfd6c6f72a3b67548f5483c.
Instead of disabling the asserts, rather enable the debug code
so the asserts actually trigger.
Change-Id: I6f62588d836de5c926294241e8d7196a963e4aac
Reviewed-by: Eckhart Koppen <eckhart.koppen@nokia.com>
Peter Hartmann [Wed, 16 Nov 2011 11:17:38 +0000 (12:17 +0100)]
SSL: fix compilation warning with gcc 4.6.1
"qsslconfiguration.cpp:204:73: warning: suggest parentheses around
comparison in operand of ‘|’ [-Wparentheses]"
Change-Id: I887ffdf3ef8263c35a8f391b3fc97faee41b7dab
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
aavit [Tue, 15 Nov 2011 08:13:46 +0000 (09:13 +0100)]
Fixes: unwanted gcc export of symbols from bundled libpng
This removes a change to libpng that was only relevant for building
a certain Qt 4 tool in certain environements without system libpng.
This is no longer relevant, so this kludge should now be removed.
Change-Id: I9a04ab0224f9e84ccab3ec27762582be439fe3ef
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Toby Tomkins [Tue, 15 Nov 2011 01:23:33 +0000 (11:23 +1000)]
Fix Qt namespace compilation.
Change-Id: I259b5fde8e4d75d28def8650c4c9208accdf0bbe
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Peter Hartmann [Mon, 14 Nov 2011 11:33:55 +0000 (12:33 +0100)]
SSL namespace: rename TlsV1 to TlsV1_0
This is a source-incompatible change.
TlsV1 is ambiguous; what is actually meant is TLS version 1.0. There are
also TLS versions 1.1 and 1.2; we might want to add options for these
once OpenSSL supports them (apparently they will be with OpenSSL version
1.0.1).
Change-Id: I940d020b181b5fa528788ef0c3c47e8ef873796a
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Bradley T. Hughes [Mon, 14 Nov 2011 13:38:38 +0000 (14:38 +0100)]
Make it possible to disable the 'check' target
If subdir.CONFIG contains no_check_target, we do not recurse into
that subdir when generating the 'check' target.
This will be used to selectively disable crashing tests on Mac OS X.
Currently, all autotests are disabled on Mac OS X. The goal is to re-
enable them, but not all at once. This approach allows us to get each
change through the CI system individually.
The first step is get all tests to build, but not run, then we will
re-enable the tests for each module, possibly disabling individual
tests at the same time.
Change-Id: I69f62c238f381ae0315d414cd71d76bc88b088dd
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Bradley T. Hughes [Mon, 7 Nov 2011 12:39:35 +0000 (13:39 +0100)]
Remove warnings from deprecated atomic operators in autotests
Use QAtomic*::load() and ::store() instead of the deprecated
cast, assignment, and comparison operators. These will be removed
in the near future.
The tests for these particular operators have not been changed,
though, as the change to remove the operators will also remove
the respective tests.
Change-Id: I2f24d18992af0c6e0f487d707218e4e84f4bdd12
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Jędrzej Nowacki [Wed, 9 Nov 2011 12:15:26 +0000 (13:15 +0100)]
Make QTest::newRow a bit more verbose if a data tag is null.
Currently QTest::newRow function expects to have correct tag string for
each test data. This was enforced by a simple assert. By adding a
an assert with message we might simplify debugging of a test that
generates test cases.
Change-Id: I84ebb397264c99e7bb46d281fd38583dd2d6964c
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Eckhart Koppen [Wed, 16 Nov 2011 07:47:45 +0000 (09:47 +0200)]
Fix Q_ASSERT usage in case -force-asserts is enabled
Certain Q_ASSERT usages are not compiling with -force-asserts since they
are checking for instance variables or other items which are not
available in release mode.
This fix guards the asserts to only be enabled in debug mode.
Change-Id: I2ed74e3d5118608361e8c924e93d8ff0efdc8eab
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Jørgen Lind [Tue, 15 Nov 2011 14:05:52 +0000 (15:05 +0100)]
Add correct event mask for Qt::WindowTransparentForInput in xcb plugin
Change-Id: I4c683c08876cc6fa934971399af7e48b160168fc
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Jørgen Lind [Tue, 15 Nov 2011 14:02:03 +0000 (15:02 +0100)]
Adding a "helper assert" for when you can create QWindow
maybe if your trying to instansiate a QWindow before the QApplication has
been instansiated.
Change-Id: I68ed4ad1dbdfedc242a7cb27c1381d50a3d3dfa4
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Pasi Matilainen [Mon, 14 Nov 2011 14:39:25 +0000 (15:39 +0100)]
Fix QDockWidget titlebar button positioning on Mac OS X
Move the QDockWidget close and float buttons from the right end of the
dock widget title bar to the left end to avoid Mac App Store rejection.
Task-number: QTBUG-19493
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from commit
3b2bd144b7873daf2e7119248dbac7c0f0253993)
Change-Id: I3b2bd144b7873daf2e7119248dbac7c0f0253993
Tero Ahola [Mon, 14 Nov 2011 14:27:01 +0000 (15:27 +0100)]
Fixed memory leak in Windows Vista style widgets
The animations are now deleted in destruction of the Vista style.
With the previous implementation the animations were not deleted for
instance if you move mouse cursor off from a widget with hover
animation (like QPushButton).
Task-number: QTBUG-21532
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from commit
261bbb12003dab0e45b5814f85dd74aa64bcfb79)
Change-Id: I261bbb12003dab0e45b5814f85dd74aa64bcfb79
Jiang Jiang [Fri, 11 Nov 2011 16:25:30 +0000 (17:25 +0100)]
Provide defaultFont with fontconfig db
So that it won't just return "Helvetica" that may not exist in
target system. Providing it seems to fix QTBUG-21833 as well,
thus we can remove the QEXPECT_FAIL statement in qlistview test.
'_' appears to reach the minimum right bearing in some fonts.
Task-number: QTBUG-21833
Change-Id: I2340af6ee736083ec4f6575e469840ebec4e545e
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Jędrzej Nowacki [Tue, 15 Nov 2011 12:49:52 +0000 (13:49 +0100)]
Hide QVariant helper classes in a namespace.
Moving these classes to an unnamed namespace reduced chances of
a name conflict and size of executable. GCC 4.6 in release mode produces
a 5kB smaller binary.
Change-Id: Ie1819a88180f9db1cd32cc59ea6fe268ecbd5813
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Kent Hansen [Tue, 15 Nov 2011 15:39:16 +0000 (16:39 +0100)]
Ensure that QOpenGLMultiGroupSharedResources are cleaned up
When a GL context group is destroyed, all multi-group shared
resources associated with the group should be cleaned up.
Otherwise we could get a double deletion in the resource's
destructor, because it still retained a pointer to the
deleted group.
The missing cleanup resulted in a crash when the global
static qt_gl_functions_resource was destroyed, first seen
in the tst_examples autotest in qtdeclarative. It possibly
didn't manifest before because it's event loop-dependent
(the contexts are deleted via deleteLater()).
Change-Id: I6b1e0bfdfbbb2bff8e795f545e680fcdfa094768
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Kent Hansen [Tue, 15 Nov 2011 11:22:15 +0000 (12:22 +0100)]
Make V8 build on Windows again
Forgot to add a Windows-specific source file to the project
when the new V8 version was imported.
Change-Id: Id20dcba132bf2609338845e8a769fcc8c1cbc562
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Richard Moore [Mon, 14 Nov 2011 21:56:40 +0000 (21:56 +0000)]
Add the ability to do unsafe SSL renegotiation as a fallback.
This commit adds the ability to perform legacy SSL renegotiation as
a fallback via QSsl::SslOptions. This is something that used to work,
but has been disabled by default in newer versions of openssl. The
need for this has been reported by users (eg. in QTBUG-14983).
Change-Id: I5b80f3ffd07e0c5faddc469f6a8f857bac5740f7
Reviewed-by: Corentin Chary <corentin.chary@gmail.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Olivier Goffart [Tue, 15 Nov 2011 09:33:32 +0000 (10:33 +0100)]
moc: Remove code that generate QMetaObject.
This code is totally outdated, and has never been used in Qt4 AFAIK
Change-Id: I775fe87532807e77fc94fe661e4b659c11bfd8be
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Olivier Goffart [Tue, 15 Nov 2011 09:14:23 +0000 (10:14 +0100)]
moc: fix Q_INVOKABLE returning references
The moc generated code would not compile otherwise
Keep Moc::parseFunction and Moc::parseMaybeFunction in sync
(the first is used for signals and slots, and the second for normal
functions such as Q_INVOKABLE)
Last patch that introduced function pointer updated parseFunction
but not parseMaybeFunction
When a slot return a reference, moc generate code that make the
MetaObject system think it is a void, so qt_metacall and invokeMethod
do not mess with the return value.
But when we want to take the function signature, in the IndexOfMethod
call, we need to have the exact return type.
Change-Id: I4661218d7ce367ad3934e73929e7d04f0a6dbc09
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Morten Sorvig [Wed, 19 Oct 2011 13:06:45 +0000 (15:06 +0200)]
Add valgrind suppression files.
Change-Id: I35626479267de49924038a0aa93103a14f05702a
Reviewed-by: hjk <qthjk@ovi.com>
Richard Moore [Thu, 10 Nov 2011 22:37:16 +0000 (22:37 +0000)]
Always use the hex format for certificate serial numbers.
In Qt 4.x the serial number is reported by a mixture of the hex value
and the number, The hex is what is used by other tools, and we should do
the same.
Change-Id: Ia0361d43fb5b920d053c95e932e0c8a012436e5e
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Olivier Goffart [Mon, 14 Nov 2011 21:35:05 +0000 (22:35 +0100)]
QEventDispatcherQPA: processEvents should only be called once
This caused a "deadlock" in tst_qobject::moveToThread
The problem was that QEventLoop::quit was called from the first
prcessed event in that loop, put calling process event a second time
deadlock because there is no more event to process
(In practice, some event can come from the window manager or the
inputs, but they may as well not come)
Change-Id: Ia469110eb9c9de57669e80cf19e933f410e469a4
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Sven Anderson [Thu, 8 Sep 2011 15:40:55 +0000 (17:40 +0200)]
Allow to create a custom event dispatcher for specific QThreads.
QAbstractEventDispatcher() does no longer install itself into the current
thread. Instead the new methods QThread::setEventDispatcher() and
QCoreApplication::setEventDispatcher() allow to install a custom event
dispatcher into any QThread as long as there is no default event dispatcher
created yet. That is, before the thread has been started with
QThread::start() or, in case of the main thread, before QCoreApplication has
been instantiated.
Change-Id: I7367e13d8d8aebed5a5651260bb69b8818eb1b90
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Jason McDonald [Wed, 9 Nov 2011 00:31:43 +0000 (10:31 +1000)]
Remove obsolete QSKIP parameter.
Change-Id: I269337d802ec6b383a496fe8dc62a6b11e4d61c5
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Bradley T. Hughes [Mon, 7 Nov 2011 11:44:20 +0000 (12:44 +0100)]
Compile on Mac OS X
privateqt_mac_p.h lives in QtWidgets/private/qt_mac_p.h now instead of
QtGui/private/...
Change-Id: I77e57de5581829e78919b13b10f7a896879670a7
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Rohan McGovern [Thu, 23 Jun 2011 08:48:33 +0000 (10:48 +0200)]
Integrate testcocoon support into Qt build system.
To instrument a Qt application or library with the TestCocoon coverage
tool, do `CONFIG+=testcocoon' in the application .pro file.
To instrument Qt itself with testcocoon, use the `-testcocoon' configure
option.
Change-Id: Ie77109a078d11ea51f7a073621e0df9c752c44ae
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Charles Yin [Fri, 11 Nov 2011 01:33:41 +0000 (11:33 +1000)]
Make QTest::qWait() handle DeferredDelete event
The QTest::qWait() function does not handle DeferredDelete, in this case
all deleteLater() calls before the qWait() won't be processed during the
wait. Add an explicit sendPostedEvents(0, QEvent::DeferredDelete) to fix
this problem.
Task-number:QTBUG-22633
Change-Id: I2c5574b4e7d3c070fad6382dc36ddfd1dfac50d6
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Jason McDonald [Mon, 14 Nov 2011 04:10:59 +0000 (14:10 +1000)]
Avoid crash in QColumnView autotest.
When combined with http://codereview.qt-project.org/8644, the test
crashes. This appears to be due to a column of the view being deleted
in response to calling setCurrentIndex(), as documented in QTBUG-22707.
This commit must be merged at the same time as
http://codereview.qt-project.org/8644.
Task-number: QTBUG-22707
Change-Id: I075be7df5d9196e37e2286e61d317086a76a167d
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jiang Jiang [Mon, 14 Nov 2011 10:47:03 +0000 (11:47 +0100)]
Do not add QPF fonts to basic font db
QPlatformFontDatabase::populateFontDatabase() routine uses a different
usrPtr format which is not compatible with the one basic font db uses
(FontFile *). We shouldn't mix them together.
Task-number: QTBUG-22713
Change-Id: I239ea085e14261f6b9ba66b03710a590a44378f9
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Laszlo Agocs [Sat, 5 Nov 2011 12:00:53 +0000 (14:00 +0200)]
Properly handle position in non-synthetic ConfigureNotify with xcb
The received window position cannot be trusted blindly, e.g. in case
of resizing a window via the mouse or calling showMaximized() the
position is bogus (for our purposes). Instead, it needs to be queried.
Before
37f338e5edc6d7b70b5a4eaf63326f2a22d7bfbd an incomplete
workaround was in place however it got removed in that commit,
resulting in weird off-by-a-certain-amount mouse position issues in
certain use cases. This patch aims to fix the issue similarly to how
it was done in Qt4.
Change-Id: I2d2a69b81a2782117b700fe366fae4c102aca1f4
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Pekka Vuorela [Fri, 11 Nov 2011 08:42:28 +0000 (10:42 +0200)]
Document QPlatformInputContext
Change-Id: I8f7599ed1f03d29a11713c7a11ed5b61a17e3dfe
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Mikko Knuutila [Mon, 14 Nov 2011 09:18:22 +0000 (10:18 +0100)]
Fix for QMessageBox's autotest.
Mnemonic shortcut caused string comparison to fail.
Task-number: QTBUG-22119
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from commit
11a6d868b5613dd7fdbef02198aaf9566fcd1f17)
Change-Id: I11a6d868b5613dd7fdbef02198aaf9566fcd1f17
Mikko Knuutila [Mon, 14 Nov 2011 09:18:21 +0000 (10:18 +0100)]
Fix for the button size calculation in qmessagebox.cpp
Actually use the calculated size for needed space instead of just
ignoring the return value.
Task-number: QTBUG-16315
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from commit
0792215fa8d227617a2080af9f12fd7f486b87d6)
Change-Id: I0792215fa8d227617a2080af9f12fd7f486b87d6
Bradley T. Hughes [Mon, 7 Nov 2011 11:49:08 +0000 (12:49 +0100)]
Disable qmacstyle test on Mac OS X
The QMacStyle is not built as part of QtWidgets at the moment (see the
TODO in src/widgets/styles/styles.pri), so disable the test for now.
I've included a comment in styles.pri to re-enable the test once the
style is done.
Change-Id: Ia6ea130135586f107ba257bf2c6c2c7187a830b6
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Bradley T. Hughes [Mon, 7 Nov 2011 11:43:20 +0000 (12:43 +0100)]
Autotests need to link to QtTestLib
Otherwise the symbols used by the test aren't found when linking.
Change-Id: Ibc78ac76763d0558824b797582e16f97786c5840
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Bradley T. Hughes [Mon, 7 Nov 2011 11:40:10 +0000 (12:40 +0100)]
Compile with non-C++11 compilers
Function pointers used as template parameters must have external linkage
according to the C++ standard. The _mm_lddqu_si128() and
_mm_load_si128() intrinsic functions are declared static in most
implementations, which means we need to wrap them in a non-static
function call to be used.
Change-Id: I4e316851df890d77999649d47654f7f9a35d4080
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Bradley T. Hughes [Fri, 4 Nov 2011 10:40:19 +0000 (11:40 +0100)]
Define __GNUC__ to be 4 on Mac OS X
The QMAKE_COMPILER_DEFINES are used when running moc. In some cases, Qt
checks the __GNUC__ value to determine which version of GCC is being
used. In particular, the qtconcurrentfilter and qtconcurrentmap tests
fail to compile because moc ends up defining QT_NO_CONCURRENT_FILTER and
QT_NO_CONCURRENT_MAP since the condition __GNUC__ < 4 evaluates to true.
The Mac OS X development tools have not used gcc 3.x is a very long
time. The current version ships with llvm-gcc-4.2.1 and clang (which
also masquerades as gcc 4.2.1). Defining __GNUC__=4 makes sure that moc
preprocesses headers in the same way the compiler does.
Change-Id: Ie491d3f5b074fd1a509ffe6755f3308836817b6c
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Tor Arne Vestbø [Mon, 14 Nov 2011 12:16:12 +0000 (13:16 +0100)]
Fix config tests for modules on Mac OS X
We look for a regular binary, but Mac OS X produces application bundles
by default. Instead of looking for an app bundle as well, we unify things
a bit by disabling app bundles instead.
Change-Id: I5eb173d98e893e616f23b91f13282cf95ef4f56a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Peter Hartmann [Mon, 14 Nov 2011 15:21:38 +0000 (16:21 +0100)]
HTTP: blacklist server for pipelining
that server was found out not to support HTTP pipelining.
tested manually; for more information see the task.
Change-Id: I9120e8be1a9a05f39f99752d6426c92fa3d093f2
(cherry picked from commit
ec6d7694f72498d1b156bb0ae8d305e01931f7b2)
Reviewed-by: Markus Goetz
Task-number: QTBUG-21369
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Rick Stockton [Thu, 10 Nov 2011 05:02:18 +0000 (21:02 -0800)]
Support 31 mouse buttons (with platform plugins xcb and xlib).
This commit includes changes for mouse button support within the XCB
and XLIB platform plugins. Support in other platform plugins will be
added in the future. The namespace update is prerequisite to compile
the the Plugins, and the update in qguiapplication.cpp is required for
the enhancements to actually work.
Task-number: QTBUG-22642
Change-Id: Ie18fca3b9c86d0b6abbf2103a4f8582e6ce83e7d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Jędrzej Nowacki [Fri, 11 Nov 2011 12:03:15 +0000 (13:03 +0100)]
Fix source incompatibility for QVariant{Map, Hash, List}
Change
7f35d5849e7233efac16c12271c58a049923b1c0 (Refactor QMetaType
types.) introduced a source incompatibility by moving typedefs for
QVariantHash, QVariantList and QVariantMap from qvariant.h file to
qmetatype.h.
The main issue here is that syncqt script is not able to distinguish
between a forward declared typedef and definition of a typedef as they
look same in source code. So generated header files for the typedefs
were pointing wrongly to qmetatype.h which didn't have full definition
of QVariant.
Change-Id: I0268c666efd0f91d76af0ff91fb30525e3dd6223
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Kevin Simons <kevin.simons@nokia.com>
Kevin Simons [Fri, 4 Nov 2011 11:20:49 +0000 (12:20 +0100)]
Add a new handler to syncqt for explicitly dealing with special case headers
Change-Id: I83b26fc88aee0052502c0a4d385ea97f8c933c66
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Peter Hartmann [Tue, 1 Nov 2011 13:20:19 +0000 (14:20 +0100)]
network: remove Symbian specific code
removes several files and cleans up the code, removing all Symbian
specific #ifdef's etc.
Change-Id: Ie457e54cb4b3a992f251383320d47822259c38f1
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Olivier Goffart [Mon, 31 Oct 2011 14:22:31 +0000 (15:22 +0100)]
moc: support mapping pointers to member functions to indexes
This change adds QMetaObject::IndexOfMethod as a parameter to
the qt_static_metacall function.
It lets the moc generated code return the index of a signal or slot
given its pointer to member function
This is required to support the new connection syntax
Change-Id: I39198c6699b5aa3599d3d282f7ac79b1e3684d33
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Jiang Jiang [Mon, 14 Nov 2011 09:45:51 +0000 (10:45 +0100)]
Remove unused Mac code
Change-Id: I226ff0928cdeb70bb7f71ccace5066a430c3b05c
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Richard Moore [Fri, 11 Nov 2011 23:08:42 +0000 (23:08 +0000)]
Deprecate QSslCertificate::isValid() replace with isBlacklisted()
Currently isValid wrongly gives the impression it checks a certificate
for validity - it doesn't. It merely checks if the certificate dates
are valid and if the certificate is blacklisted. Since it's already
easy for users to check the dates, let's just give them access to the
ability to check for blacklisting.
Change-Id: I25be3bde6a01063034702a9574b28469bf4882cd
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
jahonkon [Fri, 11 Nov 2011 09:59:47 +0000 (10:59 +0100)]
Fix QPlainTextEdit when using Qt::TextSelectableByKeyboard flag
It is not possible to select text with keyboard when specifying only
Qt::TextSelectableByKeyboard flag.
Task-number: QTBUG-18952
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from commit
054fa68b6ae852e84f2d44a73260b4282286f5ab)
Change-Id: I054fa68b6ae852e84f2d44a73260b4282286f5ab
Tero Ahola [Fri, 11 Nov 2011 12:03:02 +0000 (13:03 +0100)]
Mac: Fix the color of check marks in menus with stylesheet
Task-number: QTBUG-16989
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Morten Johan Sorvig <morten.sorvig@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
(cherry picked from commit
22c7a2f69e833789e9b5613f809ea43561624482)
Change-Id: I22c7a2f69e833789e9b5613f809ea43561624482
Mikko Knuutila [Fri, 11 Nov 2011 13:15:29 +0000 (14:15 +0100)]
Added base 10 to be used with QIntValidator.
Fixes an error in QIntValidator, which occurred because
locale.toInt() was missing a parameter for base value and this
led it to presume wrongly that a base 8 is in use.
Task-number: QTBUG-21602
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from commit
ee3f763f3642d1a098e6293fbc586b34a3e6e8be)
Change-Id: Iee3f763f3642d1a098e6293fbc586b34a3e6e8be
Markku Heikkila [Fri, 11 Nov 2011 13:35:23 +0000 (14:35 +0100)]
Fixed wrong QGroupBox check state
Handle mouserelease only if mouse is pressed in QGroupBox.
Task-number: QTBUG-19170
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from commit
df819cfe17f6dfd089096063524932fc4975804f)
Change-Id: Idf819cfe17f6dfd089096063524932fc4975804f
jahonkon [Fri, 11 Nov 2011 09:07:42 +0000 (10:07 +0100)]
Fix QDateEdit calendar pop-up having wrong date
When the calendar pops up it moves the date to maximum instead of
keeping the current date. Problem was caused by QCalendarPopup
signalling date change to QDateTimeEdit during internal date
synchronization from QDateTimeEdit to QCalendarPopup.
Task-number: QTBUG-11422
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
(cherry picked from commit
b0c09896a239197411027e773214a2635744695c)
Change-Id: Ib0c09896a239197411027e773214a2635744695c
Friedemann Kleint [Mon, 14 Nov 2011 08:59:39 +0000 (09:59 +0100)]
Windows platform plugin: Fix compilation with MinGW.
Change-Id: Ibecfc7c5314d0dea7d796cbc586e5db05e2a80ee
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Bradley T. Hughes [Tue, 8 Nov 2011 16:59:11 +0000 (17:59 +0100)]
Don't pass irrelevant arguments to the compiler
When building for 64-bit, don't pass options for 32-bit code generation,
and vice versa. This silences numerous warnings while building QtGui.
clang: warning: argument unused during compilation: '-Xarch_i386 -mmmx'
clang: warning: argument unused during compilation: '-Xarch_i386 -m3dnow'
clang: warning: argument unused during compilation: '-Xarch_i386 -mmmx'
clang: warning: argument unused during compilation: '-Xarch_i386 -m3dnow'
clang: warning: argument unused during compilation: '-Xarch_i386 -msse'
clang: warning: argument unused during compilation: '-Xarch_i386 -msse'
clang: warning: argument unused during compilation: '-Xarch_i386 -mmmx'
clang: warning: argument unused during compilation: '-Xarch_i386 -msse2'
clang: warning: argument unused during compilation: '-Xarch_i386 -m3dnow'
clang: warning: argument unused during compilation: '-Xarch_i386 -mmmx'
clang: warning: argument unused during compilation: '-Xarch_i386 -msse2'
clang: warning: argument unused during compilation: '-Xarch_i386 -m3dnow'
clang: warning: argument unused during compilation: '-Xarch_i386 -msse'
clang: warning: argument unused during compilation: '-Xarch_i386 -mssse3'
clang: warning: argument unused during compilation: '-Xarch_i386 -mssse3'
clang: warning: argument unused during compilation: '-Xarch_i386 -msse'
clang: warning: argument unused during compilation: '-Xarch_i386 -msse2'
clang: warning: argument unused during compilation: '-Xarch_i386 -msse2'
clang: warning: argument unused during compilation: '-Xarch_i386 -mssse3'
clang: warning: argument unused during compilation: '-Xarch_i386 -mssse3'
Change-Id: If4313b151e73db88d516998e3cf546e62495c289
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Bradley T. Hughes [Tue, 8 Nov 2011 16:35:03 +0000 (17:35 +0100)]
Don't use deprecated functions on Mac OS X
io/qfilesystemwatcher_fsevents.cpp:346:15: warning: 'stat64' is
deprecated [-Wdeprecated-declarations]
if (::stat64(it->absolutePath, &newInfo) == 0) {
^
According to 'man 2 stat' on Mac OS X, the stat64() function is
deprecated in 10.6 and above. Instead, we are supposed to define
the _DARWIN_USE_64_BIT_INODE which enables the 64-bit ino_t member in
the stat struct and uses function symbol suffixes to call the correct
version of stat with 64-bit inode support.
Change-Id: I697374186c7f4d69df783f06962ca5644222194d
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Jason McDonald [Thu, 10 Nov 2011 02:59:56 +0000 (12:59 +1000)]
Cleanup corelib autotests
Remove various disabled and/or non-helpful debugging code.
Any test diagnostics that are useful should be part of the regular test
output, as the CI system cannot switch on commented-out code when there
is a test failure. Diagnostics should also be informative -- simply
printing the value of a variable with no other information about what is
being printed (or why it is being printed) is not informative.
Change-Id: I21a6c2121be86001bb57e80f426507b6e619ee9e
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Fri, 11 Nov 2011 03:30:00 +0000 (13:30 +1000)]
Remove commented code from qfuture test.
The removed code was already commented out when first added in November
2007 and is nowhere near compiling. If there was anything of value
here, anyone who is able to find it is free to re-add a version that
actually works.
Change-Id: I4a7127a272254224f6a1e65fbd2a01000a4d2be9
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Kent Hansen [Fri, 11 Nov 2011 11:45:37 +0000 (12:45 +0100)]
Update V8
Fixes a bug in one of our patches that caused
hydrogen to optimize incorrectly.
Task-number: QTBUG-22679
Change-Id: I008088cd2b878f22e6a2ba4e002aeba9a3c70a22
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Jo Asplin [Fri, 11 Nov 2011 14:24:17 +0000 (15:24 +0100)]
Re-enabled tst_qpluginloader
This test is passing in CI.
Task-number: QTBUG-21402
Change-Id: I356476e458cac1cd434959fdf801011a607c9233
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Oswald Buddenhagen [Fri, 11 Nov 2011 15:38:16 +0000 (16:38 +0100)]
fix makefiles again
Change-Id: I981a62e8884f5c68e3f6c4b7b2f142bf75007f99
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Olivier Goffart [Fri, 11 Nov 2011 15:37:23 +0000 (16:37 +0100)]
Fix warning in tst_qobject
signal4 is not used in that function
Change-Id: I69f39a4639bfae067c411fd1166fc36ca3febbc5
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Jiang Jiang [Thu, 10 Nov 2011 18:04:14 +0000 (19:04 +0100)]
Fix symbol fonts support with FT engine
It appears that the symbol_map we obtained with FreeType doesn't
work for common symbol fonts like Wingdings, in previous X11 code
we use the code path with normal charmap, to enable it we need to
make sure QT_NO_FONTCONFIG is not defined. And since the FcCharset
functions doesn't really operates on the font database, we can
safely skip the mutex calls.
Change-Id: I8c484de200be1d47c053b10be2c51d2273dcd359
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Jiang Jiang [Thu, 10 Nov 2011 17:01:56 +0000 (18:01 +0100)]
Fix application font loading in basic font db
We need to reregister fonts in initializeDb because basic font db
doesn't have an internal record like fontconfig does, so just
repopulating the font database won't work. db->reregisterAppFonts
is now used properly as intended (reregister application fonts
after the system font database has been cleared).
Also, static variable 'initialized' in initializeDb() is removed
since we check privateDb()->count to see if it needs to be populated
again.
Task-number: QTBUG-22063
Change-Id: Ifc66392b56b72acbe08b99256c61421c204be5d7
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Harald Fernengel [Fri, 11 Nov 2011 08:57:44 +0000 (09:57 +0100)]
Replace fixqt4headers shell script
Use a perl script with a slightly better scalability. No more
quadratic behavior, takes about 10 seconds (instead of 5 hours)
on my machine to fix all QtCreator headers
Change-Id: Ic7d00c28aec390a1da27a969ece5d8102674e919
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
aavit [Fri, 11 Nov 2011 11:46:24 +0000 (12:46 +0100)]
Add Qt's debug/release mode to the lancelot autotests' client info
Change-Id: I146c035c241475e9851d11abfd3f50676c8e8bca
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Friedemann Kleint [Fri, 11 Nov 2011 13:50:20 +0000 (14:50 +0100)]
Factor out QPlatformTheme from QPlatformPlugin.
Implement QCocoaPlatformTheme. The menus and dialog
API is moved from the platform to the theme plugin.
(Both APIs contain references to QtWidget classes,
which we are working towards removing.)
The theme plugin is created after the platform
plugin, first by asking the platform plugin, then
by looking for a separate plugin if the platform
does not specify a theme.
Initial-patch-by: Morten Sorvig <msorvig@trolltech.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Change-Id: I2778cdd3a205c4ce35ead93e39fe6b4cd58a39f9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>