summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed compile of autotests with -qtnamespace.Rohan McGovern2011-11-180-0/+0
| | | | | | | Make sure to use the Qt namespace for qGlobalPostedEventsCount. Change-Id: I558a0b0fba1e22a2edd96f9499a2bab82046c4a4 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Fixed compile of autotests with -qtnamespace.Rohan McGovern2011-11-182-2/+4
| | | | | | | Make sure to use the Qt namespace for qGlobalPostedEventsCount. Change-Id: I558a0b0fba1e22a2edd96f9499a2bab82046c4a4 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Call invalidateResource() on QOpenGLMultiGroupSharedResource-owned resourcesKent Hansen2011-11-170-0/+0
| | | | | | | | | 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>
* Update V8Kai Koehne2011-11-170-0/+0
| | | | | Change-Id: Ie6157e0baa55271707b3e00ed80b67ab79f4f570 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Update V8Kai Koehne2011-11-1713-77/+381
| | | | | Change-Id: Ie6157e0baa55271707b3e00ed80b67ab79f4f570 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Call invalidateResource() on QOpenGLMultiGroupSharedResource-owned resourcesKent Hansen2011-11-173-3/+38
| | | | | | | | | 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>
* Fix tst_Moc::oldStyleCastsOlivier Goffart2011-11-170-0/+0
| | | | | | | | | 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>
* Fix tst_Moc::oldStyleCastsOlivier Goffart2011-11-171-2/+2
| | | | | | | | | 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>
* Reimplement QMetaType::typeName.Jędrzej Nowacki2011-11-170-0/+0
| | | | | | | | | 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>
* Reimplement some QMetaType methods.Jędrzej Nowacki2011-11-170-0/+0
| | | | | | | | | 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>
* Fix sliders style issues.Pierre Rossi2011-11-170-0/+0
| | | | | | | | 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
* Fix sliders style issues.Pierre Rossi2011-11-172-28/+33
| | | | | | | | 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
* Reimplement some QMetaType methods.Jędrzej Nowacki2011-11-171-369/+205
| | | | | | | | | 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>
* Reimplement QMetaType::typeName.Jędrzej Nowacki2011-11-171-97/+35
| | | | | | | | | 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>
* Improve the testability of QSslOptions.Richard Moore2011-11-170-0/+0
| | | | | | | | | | 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>
* Improve the testability of QSslOptions.Richard Moore2011-11-173-29/+79
| | | | | | | | | | 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>
* Fixed compile of QtPlatformSupport with -qtnamespace.Rohan McGovern2011-11-172-0/+8
| | | | | | Change-Id: Iba411d35abe85ecf29a44d99113954a0561ae286 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Reviewed-by: hjk <qthjk@ovi.com>
* Fixed compile of QtGui with -qtnamespace.Rohan McGovern2011-11-171-4/+4
| | | | | | | | 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>
* Fix compilation with -force-asserts.Friedemann Kleint2011-11-171-3/+3
| | | | | Change-Id: I2f697ba9ab9a5a8393e778abad4da18c7f232d7f Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Windows: Rebuild configure with support for V8 and -force-asserts.Friedemann Kleint2011-11-171-0/+0
| | | | | Change-Id: I52f4c842f0604d14a0fed8ebdc7a33938d977ec4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Windows: Add -force-asserts to configure.exeFriedemann Kleint2011-11-171-1/+7
| | | | | Change-Id: I678011f0e60d74a1b2d63a18570778e1f686f123 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Remove commented code from QBuffer autotest.Jason McDonald2011-11-171-3/+0
| | | | | | | | | 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>
* Improve Q_FUNC_INFO autotest.Jason McDonald2011-11-171-7/+6
| | | | | | | | | | | | | | 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>
* Build all tests on Mac OS X, but do not run them yet.Bradley T. Hughes2011-11-171-2/+3
| | | | | | | | | | | | | | 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>
* Don't directly access QList contentsAlberto Mardegan2011-11-161-3/+6
| | | | | | | | | | | | 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>
* Allow overriding the output dir when running syncqtTor Arne Vestbø2011-11-161-1/+2
| | | | | | | | | | | | | | | | 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>
* Revert logic when building with --force-assertsHarald Fernengel2011-11-162-23/+3
| | | | | | | | | | 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>
* SSL: fix compilation warning with gcc 4.6.1Peter Hartmann2011-11-161-1/+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>
* Fixes: unwanted gcc export of symbols from bundled libpngaavit2011-11-161-7/+0
| | | | | | | | | 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>
* Fix Qt namespace compilation.Toby Tomkins2011-11-163-1/+9
| | | | | Change-Id: I259b5fde8e4d75d28def8650c4c9208accdf0bbe Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* SSL namespace: rename TlsV1 to TlsV1_0Peter Hartmann2011-11-1610-33/+38
| | | | | | | | | | | | 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>
* Make it possible to disable the 'check' targetBradley T. Hughes2011-11-161-5/+7
| | | | | | | | | | | | | | | | | 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>
* Remove warnings from deprecated atomic operators in autotestsBradley T. Hughes2011-11-1612-194/+197
| | | | | | | | | | | | | 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>
* Make QTest::newRow a bit more verbose if a data tag is null.Jędrzej Nowacki2011-11-161-0/+1
| | | | | | | | | | 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>
* Fix Q_ASSERT usage in case -force-asserts is enabledEckhart Koppen2011-11-162-0/+20
| | | | | | | | | | | 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>
* Add correct event mask for Qt::WindowTransparentForInput in xcb pluginJørgen Lind2011-11-151-1/+5
| | | | | Change-Id: I4c683c08876cc6fa934971399af7e48b160168fc Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Adding a "helper assert" for when you can create QWindowJørgen Lind2011-11-151-0/+5
| | | | | | | | 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>
* Fix QDockWidget titlebar button positioning on Mac OS XPasi Matilainen2011-11-151-0/+101
| | | | | | | | | | | 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
* Fixed memory leak in Windows Vista style widgetsTero Ahola2011-11-151-0/+1
| | | | | | | | | | | | | 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
* Provide defaultFont with fontconfig dbJiang Jiang2011-11-154-3/+11
| | | | | | | | | | | 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>
* Hide QVariant helper classes in a namespace.Jędrzej Nowacki2011-11-152-0/+4
| | | | | | | | | 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>
* Ensure that QOpenGLMultiGroupSharedResources are cleaned upKent Hansen2011-11-153-23/+36
| | | | | | | | | | | | | | | | | 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>
* Make V8 build on Windows againKent Hansen2011-11-151-1/+2
| | | | | | | | 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>
* Add the ability to do unsafe SSL renegotiation as a fallback.Richard Moore2011-11-156-4/+23
| | | | | | | | | | | 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>
* moc: Remove code that generate QMetaObject.Olivier Goffart2011-11-154-320/+0
| | | | | | | 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>
* moc: fix Q_INVOKABLE returning referencesOlivier Goffart2011-11-152-1/+20
| | | | | | | | | | | | | | | | | | | 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>
* Add valgrind suppression files.Morten Sorvig2011-11-152-0/+154
| | | | | Change-Id: I35626479267de49924038a0aa93103a14f05702a Reviewed-by: hjk <qthjk@ovi.com>
* Always use the hex format for certificate serial numbers.Richard Moore2011-11-153-17/+13
| | | | | | | | | 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>
* QEventDispatcherQPA: processEvents should only be called onceOlivier Goffart2011-11-151-1/+0
| | | | | | | | | | | | | | 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>
* Allow to create a custom event dispatcher for specific QThreads.Sven Anderson2011-11-1510-29/+211
| | | | | | | | | | | | | | 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>