summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
...
* Tests: stabilize tst_QDockWidget on small screensJ-P Nurmi2013-03-201-1/+1
| | | | | | | | | | | | | The test has been recently failing in CI. The problem was easy to reproduce in a virtual machine by resizing the window of the virtual machine small enough. This change makes sure that the requested size hint is significantly smaller than the desktop size, to avoid the window manager stepping in and limiting the window size. Change-Id: Id8ce63b2b88cbed964e0330633c5d2e1dc33598c Reviewed-by: Caroline Chao <caroline.chao@digia.com> (cherry picked from commit 36e6632fa363152e1a0d42e53a0e5ada09092324) Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Improve emission of FocusScope focusChanged signals.Andrew den Exter2013-03-193-13/+555
| | | | | | | | | | | | | | | | | | | | | | | Emit activeFocusChanged up the focus tree when an item receives a focus event, rather than when the focusItem changes which happens before internal state is sufficiently updated for hasFocus and hasActiveFocus to return the correct values from within a changed signal handler. There are some limitions to this. First the signals are not emitted reliably when the scene is not active which makes sense for activeFocus but not for focus. The second is in some instances the focus and activeFocus can update unnecessarily while the focus chain sorts itself out. QDeclarativeItem tests by Andreas Aardal Hanssen <andreas@hanssen.name> Task-number: QTBUG-28288 Task-number: QTBUG-25644 (cherry picked from qtquick1/c520a69f06317fb90d37324bf284ef9614cb5dbf) Change-Id: Iac12bf8c95cbf3525b454f4afca06a54a5c14b4e Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name> Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* QThread::isFinished should return true from finished()Olivier Goffart2013-03-191-0/+35
| | | | | | | | | | | | | | | | | | | | | | and isRunning() should return false. This restore the Qt 4.7 behaviour In Qt 4.7, the finished() was called with the thread's intenal mutex locked. Which mean that: - Call to isRunning or isFinished called from a slot connected to finish within the thread would deadlock. (Hence no compatibility to keep here) - Call to isRunning or isFinished from a slot connected with QueuedConnection in another thread would lock the mutex until the destructors are finished. and then return as if the thread have finished. Change-Id: I963eccae8f7634aff90cc4bbab6ca886a78e35eb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry-picked from qtbase commit ec5e59b73c20a7dc6aec96c829f1e53c3fa58c07) Task-number: QTBUG-30251 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fixed dashes being rendered differently depending on system clip.Samuel Rødal2013-03-141-0/+39
| | | | | | | | | | | | We need to clip lines to the unclipped device rect in the case of dashing, since otherwise the dashes will be shifted and rendered differently when partial repaints are done. Task-number: QTBUG-24762 Change-Id: I3599b54baa552acc20bf8cc2e12f846b45f6019e Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> (cherry picked from commit a12f6ba302e54c1570c54aa4c722f2dafbf794af)
* Update Irish locale to return correct date formatEl Mehdi Fekari2013-03-131-0/+3
| | | | | Change-Id: I89ad9b97dba6f76d34a23ec03b119fb51e592917 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fixed QTreeWidgetIterator to work with sorted QTreeWidgetJan Arve Saether2013-03-131-0/+27
| | | | | | | | | | | | | We cannot access children directly, since that won't ensure that the pending sort is executed. However, the functions we need are there already and actually makes the code nicer. Task-number: QTBUG-29903 Change-Id: I6899284275dd79b991896a5f08486b58d95f819d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> (cherry picked from qtbase/aa2d10750ad8cdb6a86d519063664c2924b2a635) Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Fix warnings in tests (CLANG).Friedemann Kleint2013-03-113-4/+3
| | | | | | | | | - Statement has no effect - Adding int to string - Unspecified behavior when comparing character literals. Change-Id: Ie9cb9a1036b5cf5c62890685c60dee4af1ce7148 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* QSslConfiguration: toggle on demand loading of root certs properlyPeter Hartmann2013-03-042-5/+69
| | | | | | | | | | | | | | | | | make sure we keep track of when we can load root certs and when we cannot (we cannot when the developer set the certs explicitly). This is implemented the same way for QSslSocket already, and needs to be duplicated because we have 2 methods for setting CA certificates: one in QSslSocket and one in QSslConfiguration. In addition, adapt the auto test which checks whether setting a default QSslConfiguration works: There is no way to set on demand loading through the API, so it should be enabled by default. Task-number: QTBUG-29103 (backport of commit ce35c0db0d9dd849c736eabaeb57d597186aaa13) Change-Id: Idf15c21092c7727e1080b1c261ce055f30dbcf63 Reviewed-by: Richard J. Moore <rich@kde.org>
* Flickable shouldn't grab the mouse until it starts an effective move.Andrew den Exter2013-02-223-2/+114
| | | | | | | | | | | | If the boundBehavior prevents the flickable from moving its content item in response to a drag it shouldn't grab the mouse as that will prevent a parent MouseArea or Flickable from handling the drag. (cherry picked from commit e8ca72d484c0e56f030e4742bb5f92b6f0555146) Task-number: QTBUG-29718 Change-Id: Ief82ef7b898ea2581fd0b7e52548f451d887e2f1 Reviewed-by: Alan Alpert <aalpert@rim.com>
* MouseArea shouldn't grab the mouse until there is an effective drag.Andrew den Exter2013-02-222-0/+119
| | | | | | | | | | | | A MouseArea shouldn't prevent a parent MouseArea or Flickable from handling a drag event unless it is going to do something useful with it. (cherry picked from commit 67db779665b1d95a20720c0dee058c47f7df8726) Task-number: QTBUG-29717 Change-Id: I17caa51ebc2e547e73e727fd185e60644591ad2b Reviewed-by: Alan Alpert <aalpert@rim.com>
* QStackedLayout: Fix crash when focus widget is destroyed in hide()Jan Arve Saether2013-02-201-0/+89
| | | | | | | | | | | We also have to make sure that when moving back to a page that has a focusWidget(), the focus should go to the focusWidget() Task-number: QTBUG-18242 Change-Id: Ibfa7d6361c1a456480b2f1584a88ef4c4f405709 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> (cherry picked from qtbase/18f9eb797bffe8626f1edeca3c88f80dae0da8d7)
* Clean whitespaceJan Arve Saether2013-02-201-5/+5
| | | | | | Change-Id: Iec1950a0f4053cd71633162f0cb50efc9d4d493f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> (cherry picked from qtbase/64106705e7ca6132b1de15529c6206ebb0c58dfa)
* Fix QDeclarativeListView currentSection property updateNils Jeisecke2013-02-201-0/+31
| | | | | | | | | | | | Model modifications that did not trigger the refill logic caused the view's currentSection property to contain an outdated value. A new autotest has been added to catch the bug. Task-number: QTBUG-29712 Change-Id: I88cf1295ac55dad7596b6ba1fe475ebf98a31026 Reviewed-by: Alan Alpert <aalpert@rim.com> (cherry picked from qtquick1/d31f965b72a1bb8aba0b846471780e90fcc895ba)
* Add a method that allows registration of files to typesAlan Alpert2013-02-193-0/+23
| | | | | | | | | | | | | | | There is currently no way in C++ to duplicate the functionality of a qmldir file in mapping QML files to versioned types in a module. This functionality would be useful both in cases where a separate qmldir file would be overkill, and for cases where the type mapping should be generated dynamically. Since public API is frozen for 4.8, this is being added as private API for those who need some measure of compatibility with qtquick1 in Qt5. Change-Id: I28d7898122c5556fcd7cf3476795bcf4bb288ea6 Manual cherry pick of qtquick1/9995a2910d8a5f0317fe3adeb54f838b99ab31a8 Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QLocale: Update tamil's AM/PM textEl Mehdi Fekari2013-02-151-0/+4
| | | | | | Change-Id: I355d24fcaaf2c76b8bdbc51f71f931118f5cb3cd Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Fixed checking HOME variable return value using isEmpty()Pasi Petäjäjärvi2013-02-131-0/+8
| | | | | | | | | | | | Return value of the QFile::decodeName(qgetenv("HOME")); is never null if HOME environment variable is not set. So need to check the return value using isEmpty() instead. Task-number: QTBUG-28912 Change-Id: I7875520965bf2c0c7311fb051c1f5177e9c3685b (cherry picked from qtbase/05b4000e01ff5785739617c3069fbe0b0d36a606) Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* QLocale: Update the Japanese and Czech localeEl Mehdi Fekari2013-02-121-0/+7
| | | | | | | | | | | - Japanese locale: Year should be displayed in 4 digits instead of 2 in short format - Czech locale: monthName should be displayed in lower case N.B: The changes above are already fixed on Qt 5 that uses an updated version (v22.1) of CLDR Change-Id: I40535ea60b1f6abdd3717a28adbcddaa63b39997 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fixed crash in image reader when reading certain BMP files.Samuel Rødal2013-02-083-0/+2
| | | | | | | | | | | | | | | | If the high bit in a mask is set, for instance if the mask is 0xff000000, and we shift it to the right by 24 positions, since the mask was not declared as unsigned we ended up with a mask value of 0xffffffff. We then add 1 to this value and divide by the result, causing a division by zero crash. The masks need to be declared unsigned to prevent sign bit extension when shifting right. Task-number: QTBUG-29194 Change-Id: I1003d546a70d540b5c135b6b75dee9b4962a7210 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> (cherry picked from qtbase, af84313c622af880e95d461ea8b7dbca58d2dffa)
* Make sure QGraphicsItem notifies changes to focusScopeItem.Andreas Aardal Hanssen2013-01-291-0/+57
| | | | | | | | | | | | | | | | | | | A glitch in QGraphicsItem's logic made it update the focusScopeItem pointer, but fail to notify the change to QDeclarativeItem through the d_ptr->focusScopeItemChange() virtual function, hindering QDeclarativeItem from emitting focusChanged() correctly for focus scopes that do not have focus. Two lines were moved, and a comment updated to reflect the reason why the "return" is needed at this point. It's clear that the calls to focusScopeItemChange() are unrelated to the return. Task-number: QTBUG-29260 Change-Id: I12ba9161b16d34c3689401a92c86d2047989f7bd (cherry picked from qtbase/6476d6728eb3cde8e4a5fd0eb607b92977932296) Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> Reviewed-by: Alan Alpert <aalpert@rim.com>
* QSslSocket tests: use qt-project as test server instd of qt.nokia.comPeter Hartmann2013-01-292-2/+2
| | | | | | Change-Id: I3210f60d2076f31f8b1d3316d1f11707e542813e (backport of commit 7d757fc8feb5090b464f65fe243b6a88eb1f8f3e) Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix postgres notification support in the QPSQLDriver.Matt Newell2013-01-271-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a critical bug in the qsqlpsql driver where notifications aren't delivered when received. Any blocking libpq function(specifically PQexec) will read all the incoming data from the socket, including any pending notifications. This would cause the socket notifier to never be fired for incoming notifications that are already queued inside libpq. The qsqldriver test case was skipping the postgres notification test because of this bug, now its enabled and passing. In order to fix this bug I made a wrapper function for PQexec in QPSQLDriverPrivate that calls _q_handleNotification via QMetaObject::callMethod QueuedConnection in order to deliver pending notifications when control returns to the event loop. I also added a flag to ensure only one call is made each time the event loop is entered. This backport omits the changes to the NotificationSource version of the "notification" signal that were included in the original commit, since NotificationSource itself has not yet been introduced into Qt4. (Backport of qtbase aea684506945a12312fc05fb3bb4f549da93f7f5) Change-Id: I19f5297094ae7ae46bfb0717e4fca744d69f7b92 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Fix checking QT_NO_QWS_MULTIPROCESS before using QWSSharedMemSurfacePasi Petäjäjärvi2013-01-241-0/+4
| | | | | | | | | QWSSharedMemSurface is not available if we don't have multiprocess QWS, which requires QSharedMemory support. On VxWorks DKM mode, we don't support QSharedMemory and there no multiprocess QWS. Change-Id: I647a576ee4d718b3dcddb0dc4d629ffcd2e163f2 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Fix TextInput test failures.Andrew den Exter2013-01-231-6/+12
| | | | | | | | | | | | | | | | emitCursorPositionChanged won't emit cursorPositionChanged if the cursor position hasn't changed but that doesn't mean the micro focus hasn't changed, so emit updateMicroFocus changed when cursorPositionChanged isn't. Task-number: QTBUG-21017 Task-number: QTBUG-21011 Task-number: QTBUG-20719 Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com> (cherry picked from commit 6e0e834e0398192a6da11d1e1bca6b74769fb75d) Change-Id: Ia0d244eea051f2a870a084742c4c22f5a45a87bc Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fix temporary file leak in tst_qfileinfo.Friedemann Kleint2013-01-211-4/+3
| | | | | | Change-Id: I0d679638d5a9564f612ae5e70717f164b74aefb0 Reviewed-by: David Faure (KDE) <faure@kde.org> (cherry picked from qtbase/52e14e05fa83f19f64cedda2291b3a055bdead06)
* To support QT_NO_IM on Linux/Windows/MacJing Bai2013-01-213-6/+38
| | | | | | | | | | Fix compilation issue when QT_NO_IM is defined. Also fixed references in tests. But fixing plugins/examples seem not necessary at this point. Task-number: QTBUG-26109 Change-Id: I2067051951616012117efa6716640cbf198fdb2a Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Fix crashes in tst_qthreadpool on Windows.Friedemann Kleint2013-01-181-6/+28
| | | | | | | | | | | | Qt 4.8 shows frequent crashes in runMultiple apparently caused by the QMutex construction in the free functions by different threads. Use a common QMutex class member instead. Change-Id: I851d4e2d3637a7b4f404ed843f5360c10caa21f5 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from qtbase/ced523af7a3559b0f30dd2a4406e05418ff7ec89)
* Update the Indonisian and Catalan locales in CLDR data:Mehdi Fekari2013-01-181-0/+12
| | | | | | | | - Indonisian locale (in.xml): to return correct AM/PM text and correct time Fomat - Catalan locale (ca.xml): to return correct time Format Change-Id: I65bbabdc6311dc3c958605cbc04e7a034243e9db Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Change all shmget calls to user-only memoryThiago Macieira2013-01-181-1/+1
| | | | | | | | | Drop the read and write permissions for group and other users in the system. Change-Id: I8fc753f09126651af3fb82df3049050f0b14e876 (cherry-picked from Qt 5 commit 856f209fb63ae336bfb389a12d2a75fa886dc1c5) Reviewed-by: Richard J. Moore <rich@kde.org>
* QDateTime auto test: stabilize currentDateTimeUtc2 testPeter Hartmann2013-01-171-1/+1
| | | | | | | | | ... by trying more often to get dates close enough to each other. (backport of commit 170bf2a59aa863e724097825e5a0c8e8148ce109) Change-Id: Ib713ed13cf5b8bcf469ade148026d5bfa239b304 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Remove QPerformanceTimer now that QElapsedTimer contains the necessary bitsRobin Burchell2013-01-175-197/+1
| | | | | | | | | | | | QPerformanceTimer was a copy of QElapsedTimer with some additional functionality which has since been subsumed into QElapsedTimer, so remove the forked code. (backport of cd6ebb4912a5d96c788ea0c838d8a1a06ff4029e from qtdeclarative) (backport of d733f6a942e40e58ebc09f1d4414e2f8fa3f6a28 from qtquick1) Change-Id: I261f0e957ffe3fc5fe42cd50672d2dd99b080f1e Reviewed-by: Christopher Adams <chris.adams@jollamobile.com> Reviewed-by: Alan Alpert <aalpert@rim.com>
* Use a UUID for the NSToolbar in unified title and toolbar.Jake Petroules2013-01-151-0/+27
| | | | | | | | | | | | | | | | | When two NSToolbars in an application share the same identifier, Cocoa tries to synchronize their state (item position, view mode, etc.), and this behvavior interferes with and crashes Qt applications in certain cases when toggling the unified toolbar on and off. Therefore it is necessary to use a unique identifier for each native toolbar created. Does not affect Qt 5. This functionality has been removed and an equivalent will be provided by QtMacExtras which uses a completely different approach, though I7d5c8d58e45a504480a1ce67065add15cb35ad8f could be considered Qt 5's rough equivalent to this. Task-number: QTBUG-19207 Change-Id: I9030d56941d12a2c1f7a328337bf986f1b51eeb8 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Limit the range of the QUrlPrivate::port to -1 to 65535Thiago Macieira2013-01-141-0/+11
| | | | | | | | | | | | | The internal parser can read values outside this range (and cannot report an error), but QUrl::port() must not return something outside that range. The correct solution would be to report an error, like in Qt 5, but that cannot easily be done. The rewritten parser in Qt 5 is not affected by this issue. Task-number: QTBUG-28985 Change-Id: I3cf595384f14272197dcfb85943213c8f8ddeba0 Reviewed-by: David Faure (KDE) <faure@kde.org>
* QMenu: Fix nested popup when keyboard shortcut is usedOrgad Shaneh2013-01-141-0/+17
| | | | | | | | | | Task-number: QTBUG-20403 Change-Id: I2a5fe00dd16e9dc1ec0d742a8f48083fc2954996 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> (cherry picked from qtbase/b6963f109ad54c6f03b3391d57db9a536d49ba7d)
* QUrl::fromUserInput: fix for urls without a host.David Faure2013-01-141-0/+4
| | | | | | | | | | QUrl::fromUserInput("http://") was invalid, which doesn't make sense since QUrl("http://") is valid. Same for "smb:" which is actually even more a valid URL from a user's point of view. Change-Id: I371ac393d61b49499edf5adbbc2a90b426fe9e5d (cherry-picked from qt5 commit 8b2728ec382565c5bd57148600e34740a3c3fe52) Reviewed-by: David Faure (KDE) <faure@kde.org>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-131805-1811/+1811
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Stabilize tst_QDeclarativeMouseAreaAlan Alpert2013-01-111-0/+2
| | | | | | | Adding qWaitForWindowShown removes a potential source of instability. Change-Id: I6dc6ef13762d897b387ca9bc15a8a1f49c05bdf2 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* QSqlTableModel: fix dataChanged() index for removed edited rowMark Brand2013-01-101-0/+12
| | | | | | | | | | | | Last column index is columnCount() - 1 This change is not applicable to Qt 5. Task-number: QTBUG-28961 Change-Id: Ib962ab5f737bf9c216423ee9d0632757d33f3bd2 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Update Canadian(English) localeMehdi Fekari2013-01-101-0/+4
| | | | | | | | | Update dateFormat in Canadian(English) locale ("en_CA") to return: M/d/yy instead of: yy-MM-dd (Long: dddd, MMMM d, yyyy instead of EEEE, d MMMM, y) N.B: This doesn't concern Qt5 that uses the most recent version of CLDR (22.1) which already contain the fix above. Change-Id: I99f841c8f397086435d928d749c4d67e779f31f8 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Delay loading implicit importAlan Alpert2013-01-083-0/+32
| | | | | | | | | | | As a performance improvement to avoid accessing the filesystem unnecessarily, only import "." implicitly if types cannot be found in the existing imports. This is not a behavior change for type resolution, because "." already has the lowest precedence for type resolution. Change-Id: I5ac2a9fac85559eb96cba93c29d17068fe8171da Manual cherry-pick of qtquick1/dc96bfd00152e25f007511f64bff7c413f657886 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Remove 'com.nokia' string from autotestAlan Alpert2013-01-0812-80/+80
| | | | | | | Change-Id: I01347645cedc6f4ecaf3158ea8336b0672ac9a4a Backport-Of: Ic318dbe7a48412e9689ca0f4506c7098d9f48b5f Backport-Of: Ic318dbe7a48412e9689ca0f4506c7098d9f48b6a Reviewed-by: Alan Alpert <aalpert@rim.com>
* Backport PathView currentIndex fixes from Qt 5Bea Lam2013-01-082-0/+427
| | | | | | | | | | | | | | Backport 447e5acb880ebda498891623dc4009984cb73bc6 and 0fc361f96b06ba318e70610e46beb421753cae9d which fix bugs related to currentIndex. The first commit ensures currentIndex=0 when all items are removed; the second ensures that the initial currentIndex value is respected and also resets the view correctly if the model changes. (Backport of Qt5 qtquick1 5d439d751267c64408bd27ab0e6548822146a35c) Change-Id: I6bfd826c97524ed0d06a168bed7f5c321b02b4d3 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Update Turkish and Irish locales dataMehdi Fekari2013-01-071-0/+12
| | | | | | | | | | | | | | | Update Turkish and Irish locales data The Irish/Gaelic locale data (CLDRv2.0) in Qt4.8 doesn't provide all month/day names, and the Turkish AM/PM texts are not updated. This patch updates the locales data below and provides an autotest to compare the expected vs returned values: - Irisch locale data (based on ga.xml file): Add month/day names in both short and long foramt based on CLDRv22.1 data. - Turkish locale data (basod on tr.xml file): Update AM/PM text to return "ÖÖ/ÖS" instead of "AM/PM". N.B: This doesn't concern Qt5 that uses the most recent version of CLDR (22.1) which already contains the fixes above. Change-Id: Ic61ba192619582bdc6bb729f4b91f31ae2894ee0 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix QStyle-test for Windows Aero / 8.Friedemann Kleint2013-01-071-3/+29
| | | | | | | | | | | | | Increase tolerance on Windows for the Aero style. Set small top level widgets frameless to avoid warnings about minimum size of decorated windows on Windows. Task-number: QTBUG-28611 Change-Id: Ia4aec0cf0763da9955577054cb8cf81337fac134 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> (cherry picked from qtbase/34e60228d4d449f6ec9177e3ef731089db0fcef9)
* Don't increase the reference count if dynamic_cast failedThiago Macieira2013-01-054-0/+174
| | | | | | | | | | | | | | If the dynamic_cast failed in QSharedPointer::dynamicCast or qSharedPointerDynamicCast, we should avoid creating the QSharedPointer that shares the weak and strong reference counts. In Qt 5, this does not imply a leak since the original pointer is stored internally for deletion. In Qt 4 it implies a leak under certain circumstances, which this change fixes. Task-number: QTBUG-28924 Change-Id: Id2de140de4cf676461e14b201ad250c53666b79d (cherry-picked from qt5 commit a094bf5a893c3cccffff10c1420bfbe3a3c02a7c) Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix tst_QImage on QNXRafael Roquetto2013-01-051-5/+5
| | | | | | | | | | This test is also run out of source under QNX and BlackBerry targets. This patch adjust SRCDIR accordingly by actually undefining it in QNX as well. This patch is not needed by Qt5. Change-Id: Ia8e43cd209d2876d5283f51b5717060992ed78ed Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Skip failing testAlan Alpert2013-01-051-0/+1
| | | | | | Task-number: QTBUG-28830 Change-Id: If2313cf1536cd2209a92b5aee9a5980344b4f7eb Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Skip failing test for nowAlan Alpert2013-01-051-0/+1
| | | | | | Task-number: QTBUG-28829 Change-Id: If607130a936bd04fda8cc518f8b4cd8070e62c3c Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* SSL certificates: blacklist mis-issued Turktrust certificatesPeter Hartmann2013-01-042-0/+55
| | | | | | | | | | | | Those certificates have erroneously set the CA attribute to true, meaning everybody in possesion of their keys can issue certificates on their own. backport of bf5e7fb2652669599a508e049b46ebd5cd3206e5 from qtbase Task-number: QTBUG-28937 Change-Id: Iee57c6f983fee61c13c3b66ed874300ef8e80c23 Reviewed-by: Richard J. Moore <rich@kde.org>
* tst_qaccessibility: Fix warnings about window geometry on Windows.Friedemann Kleint2012-12-201-0/+19
| | | | | | | | | | Make windows frameless so that size constraints for decorated windows do not interfere. Task-number: QTBUG-28696 Change-Id: Ic4410d8a6e8166bdfe013ed2362173f8e02d4b29 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com> (cherry picked from qtbase/a0584f678b20103fe4ccbe482848051acbb00b21)
* QMdiArea: Increase minimum size for Windows 8/Large fonts.Friedemann Kleint2012-12-191-2/+2
| | | | | | | | | Task-number: QTBUG-28611 Change-Id: I115a5fa6726ac99c2bbff4ec65d3f8856b2530df Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> (cherry picked from qtbase/3e3451f42989a0dbd2398da78ad84441c7898fd3) Reviewed-by: Janne Anttila <janne.anttila@digia.com>