summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/dialogs
Commit message (Collapse)AuthorAgeFilesLines
* QSKIP test that is blocking unrelated changes in CIShane Kearns2012-06-251-2/+2
| | | | | | | | | The test looks vulnerable to misbehaviour if the working directory contains unexpected files and folders. As it's already skipped on Mac, skip on linux as well to unblock the CI. Change-Id: Id2e48ea455eb77e36c4f9d899885e101f674c0a3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* tst_qfilesystemmodel: increased test's permitted runtimeRohan McGovern2012-06-201-0/+1
| | | | | | | | | This test has recently timed out a few times on Windows test runs, with no relevant changes to account for the timeout. Double the permitted runtime. Change-Id: I93765c9ea592973495bfe3a2f63e63ed615eb542 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Make tst_qfiledialog2 closer to parallel-safe.Rohan McGovern2012-05-291-18/+23
| | | | | | | | | | | Use a QTemporaryDir instead of the system-wide temporary directory. The test is still not entirely parallel-safe (at least on X11) due to requiring the shown dialog to have keyboard focus. Change-Id: I628dc6ab52dda49f6957a301eea8944bb9d81453 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* Make tst_qfilesystemmodel parallel-safe.Rohan McGovern2012-05-292-1/+2
| | | | | | | | Changed one testfunction to use the test's own QTemporaryDir instead of the system-wide temporary directory. Change-Id: I6740a7f4ba7f53174cd0730239d8dc088e5111ba Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Add CONFIG+=parallel_test to suspected parallel-safe tests.Rohan McGovern2012-05-289-0/+9
| | | | | | | | | These tests have passed a parallel stress test on all three of Linux, Mac, Windows. Mark them with CONFIG+=parallel_test to allow CI to run them in parallel, saving time. Change-Id: I19fd333c3c645a67374ca998f6c8530dd236b0f8 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Fix bug when destruction fields in QWizardCarl Schumann2012-05-163-1/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Maintain the consistency of QWizardPrivate's two members: QVector<QWizardField> fields; QMap<QString, int> fieldIndexMap; during and after calls to QWizardPrivate's void _q_handleFieldObjectDestroyed(QObject *) member function. The failure to maintain this consistency caused an out of bounds access and core dump in QWizard's field(const QString &name) member function. QWizard's field(const QString &name) member function expects the values in the QMap fieldIndexMap to be indexes into the QVector fields. Prior to this change _q_handleFieldObjectDestroyed only removed the appropriate entry from the map and erased it from the vector. It did not decrement by one all the indexes greater than the index that was removed from the map and erased from the vector in the rest of the map. For example ... So if initially have the following mapping ... "field0" -> 0, "field1" -> 1, and "field2" -> 2 with fields of size 3. After destruction of "field1" have ... "field0" -> 0, and "field2" -> 2 with fields of size 2. Now attempts to look up "field2" using QWizard::field will have an out of bounds error and possibly core dump or trigger an internal Qt assert because an attempt to access this->fields[2] will be made. It should be accessing this->fields[1], but does not because the map is no longer consistent with the vector. This change adds a decrement by one for all the indexes greater than the index that was removed from the map and erased from the vector. Task-number: QTBUG-25691 Change-Id: Ia2a41027628a65faec4ecdd5da235ddd19746a57 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Improve widget geometry.Friedemann Kleint2012-05-091-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | - Rename posFromMove to posIncludesFrame in Widgets and make the handling more fine-grained; try to clean it up as soon as the frame margins are known in QWidgetPrivate::fixPosIncludesFrame(). - Implement QWidgetPrivate::updateFrameStrut(). - Windows: Handle posIncludesFrame in window creation, notify changed geometry after setting window flags. - XCB: Do not change the window gravity in propagateSizeHint() as this causes the window to jump around. Determine the gravity in window creation, leave it constant and fix the geometry when setting instead. - Store the normal geometry when maximize/fullscreen state change events are received. - Remove xfails from fixed tests Task-number: QTBUG-25331 Task-number: QTBUG-24905 Task-number: QTBUG-24294 Change-Id: I89c7229d86aaf88f02247d63915da7905e4a27ea Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Expose QPA API under qpa/*Girish Ramakrishnan2012-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The main reasons for doing this are: 1. _qpa.h end up in the master QtGui include file. QtGui is meant for userland applications. qpa code is neither binary nor source compatible. Inadvertant use of QPA api makes the user code binary-incompatible. 2. syncqt creates forwarding headers for non-private header files. This gives people the impression that this is public API. As discussed on the mailing list, even though QPA api is internal and subject to change, it needs to treated differently from private headers since they will be used by in-qtbase and out-of-qtbase plugins. This commit does the following: 1. The _qpa in QPA header files is dropped. 2. syncqt now treats any file with qplatform prefix as a special file and moves it to qpa/ directory. The recommended way of using QPA API in plugins is: #include <qpa/qplatformfoo.h>. This allows the user include QPA API from multiple modules (for example, qplatformfoo might be in QtPrintSupport) 3. The user needs to explicitly add QT += <module>-private to get access to the qpa api. 4. Creates compat headers for the olden style qplatformfoo_qpa.h and QPlatformFoo includes. This commit does not change the cpp filenames. This requires a more careful merging of existing non qpa cpp files and existing cpp files on a case by case basis. This can be done at anytime. The following files are not renamed as part of this changed but will be fixed as part of a future change: src/gui/kernel/qgenericpluginfactory_qpa.h src/gui/kernel/qgenericplugin_qpa.h src/gui/kernel/qwindowsysteminterface_qpa.h files were renamed using for x in `find . -name "qplatform*_qpa.h"`; do git mv $x "${x/_qpa.h/.h}"; done for x in `find . -name "qplatform*_qpa_p.h"`; do git mv $x "${x/_qpa_p.h/_p.h}"; done includes were renamed using script for file in `find . -name "*.h" -or -name "*.cpp" -or -name "*.mm"`; do sed -i -e 's,.*#.*include.*<\(Qt.*/\)\?\(QPlatform.*\)>,#include <qpa/\L\2.h>,g' \ -e 's,.*#.*include.*"\(Qt.*/\)\?\(QPlatform.*\)",#include <qpa/\L\2.h>,g' \ -e 's,.*#.*include.* "\(qplatform.*\)_qpa.h",#include <qpa/\L\1.h>,g' \ -e 's,.*#.*include.*"\(qplatform.*\)_qpa_p.h",#include <qpa/\L\1_p.h>,g' \ -e 's,.*#.*include.*<\(Qt.*/\|Qt.*/private/\|private/\)\?\(qplatform.*\)_qpa\(.*\)>,#include <qpa/\2\3>,g' \ -e 's,.*#.*include.*"\(Qt.*/\|Qt.*/private/\|private/\)\?\(qplatform.*\)_qpa\(.*\)",#include <qpa/\2\3>,g' \ $file done Change-Id: I04a350314a45746e3911f54b3b21ad03315afb67 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtWidgets]Thiago Macieira2012-05-033-5/+5
| | | | | | | | | | This operation should be a no-op anyway, since at this point in time, the fromAscii and toAscii functions simply call their fromLatin1 and toLatin1 counterparts. Task-number: QTBUG-21872 Change-Id: Ie8ac500f2f8ebe99b7525feaa7b39247e641a461 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Don't use obsolete qVariantValue, qVariantCanConvert, etc.Debao Zhang2012-05-021-12/+12
| | | | | | | | | | qVariantValue and qVariantCanConvert are Compatibility members, while in Qt4.8 they are marked as Qt 3 Support Members. qVariantFromValue and qVariantSetValue are Obsolete members. Change-Id: Ie8505cad1e0950e40c6f6710fde9f6fb2ac670fd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Respect the DontUseNativeDialog flag.Christoph Schleifenbaum2012-04-271-4/+1
| | | | | | | | | | | | | QFontDialog and QColorDialog were ignoring the DontUseNativeDialog. This lead to a native (Cocoa) dialog created all the time. Fix the testcase for QFontDialog. It needs the DontUseNativeDialog flag set. Task-number: QTBUG-24321 Change-Id: I159c1ad057bac38226f1e01a56b15f142650bfd8 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Skip tst_QInputDialog on Mac OS XBradley T. Hughes2012-04-251-0/+2
| | | | | | | | | | | This test hangs in CI, but so far I've been unable to reproduce the problem. Disable the test for now so that this test does not block changes that bring in needed functionality. Task-number: QTBUG-25496 Change-Id: I81faa574b6d7bcab2e32becc2af0f71006c7dd9c Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Merge remote-tracking branch 'origin/api_changes'Lars Knoll2012-04-172-2/+6
|\ | | | | | | Change-Id: I964b0a6f5c38351fdfafb8a2a128a349ff8c89d1
| * Skip tests toolbar-dialog/widget_window.Friedemann Kleint2012-04-171-0/+4
| | | | | | | | | | | | | | | | To enable merging the api_changes branch. Task-number: QTBUG-25331 Change-Id: I90d32ca0bd96eed62bae5f01316d6360a3b435c8 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
| * Deprecate qMemCopy/qMemSet in favour of their stdlib equivilents.Robin Burchell2012-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just like qMalloc/qRealloc/qFree, there is absolutely no reason to wrap these functions just to avoid an include, except to pay for it with worse runtime performance. On OS X, on byte sizes from 50 up to 1000, calling memset directly is 28-15% faster(!) than adding an additional call to qMemSet. The advantage on sizes above that is unmeasurable. For qMemCopy, the benefits are a little more modest: 16-7%. Change-Id: I98aa92bb765aea0448e3f20af42a039b369af0b3 Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com> Reviewed-by: John Brooks <john.brooks@dereferenced.net> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * QFileSystemModel: fix sortingGiuseppe D'Angelo2012-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When sorting a model recursively, the children of a QFileSystemNode are extracted from their parent in a QHash order; then filtered, then sorted (using a stable sort) depending on the sorting column. This means that the order of the children comparing to equal for the chosen sort are shown in the order they were picked from the iteration on the QHash, which isn't reliable at all. Moreover, the criteria used in QFileSystemModelSorter for sorting are too loose: when sorting by any column but the name, if the result is "equality", then the file names should be used to determine the sort order. This patch removes the stable sort in favour of a full sort, and fixes the criteria of soring inside QFileSystemModelSorter. Change-Id: Idd9aece22f2ebbe77ec40d372b43cde4c200ff38 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Fix tst_QDialog::deleteInExec() crash on Mac OS XBradley T. Hughes2012-04-171-1/+0
|/ | | | | | | | | | | | | | When destroying a window immediately after showing it, we can sometimes provoke a crash in Cocoa after the show-window-animation has finished (which appears to assume that the window's view will always be valid). Prevent the crash by not removing the view from the window. When recreating a window, we explicitly release the old window, but we do not release the view, so we can freely add it to the new window (i.e. this does not introduce new bugs related to recreating the platform window). Task-number: QTBUG-24977 Change-Id: I466ce75b04785401032a0a2d4a2c494910cd1672 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Mark tst_qdialog as insignificant on mac.Rohan McGovern2012-03-271-0/+1
| | | | | | | | | This autotest gives different results on consecutive runs, and is therefore insignificant for the purpose of detecting regressions. Task-number: QTBUG-24977 Change-Id: I5c4dfd663ce5df6b60ae47a29d332c06e3c0585f Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* Cocoa: fix setting color with alpha channel value for color dialogTeemu Katajisto2012-03-221-3/+0
| | | | | | | | | | | Make sure that if ShowAlphaChannel option is set then also setShowsAlpha needs to be set for the panel before setting the current color, otherwise alpha channel value is omitted. Task-number: QTBUG-24320 Change-Id: Ifb3822711af8ffd0cf6cb4c8aab2b0020d296663 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* QHeaderView - renaming functions in Qt5Thorbjørn Lund Martsum2012-03-141-1/+1
| | | | | | | | | | | | | | This patch renames the functions in Qt5 according to the notes. It also renames resizeMode to be consistent. The old functions are both marked with both QT_DEPRECATED and '### Qt 6 - remove' All usage of the function within the qtbase are also changed to use the new functions. Change-Id: I9e05fa41d232e9ca43b945fcc949987017f3aedd Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QFileSystemModel autotest fixesMiikka Heikkinen2012-02-292-59/+33
| | | | | | | | | | | | | For some reason, hiding files via executing "attrib +h filename" process didn't work realiably, so changed the file hiding to be done via Windows native API. Also changed the test to use QTemporaryDir to simplify temporary directory handling a bit. Task-number: QTBUG-24291 Change-Id: I4f02b16e2f9105bcf5e6c5bf136f55434a26e2f4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix build of QWizard tests with QT_USE_QSTRINGBUILDERStephen Kelly2012-02-291-2/+2
| | | | | Change-Id: Id276cdb9b84c61bf75a5bde149142f39f52f563e Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* qfiledialog2: Skip test that is passing on CI and failing otherwise.Toby Tomkins2012-02-271-3/+3
| | | | | | | | Task-number: QTBUG-23602 Change-Id: Id5dfb85956048c60849d865161212b0764e8f250 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* clean up qmake-generated projectsOswald Buddenhagen2012-02-242-7/+1
| | | | | | | | remove "header" and assignmets which are defaults or bogus, reorder some assignments. Change-Id: I67403872168c890ca3b696753ceb01c605d19be7 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Add further theme hints to QPlatformTheme.Friedemann Kleint2012-02-222-9/+8
| | | | | | | | | | | | | | | | - Add hints for QDialog/QDialogButtonBox. - Add hint for available popup-menu area. - Add keyboard scheme hint replacing QGuiApplicationPrivate::currentKeyPlatform() Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Task-number: QTBUG-24204 Task-number: QTBUG-24315 Change-Id: I6653786b0dcb49a6fc264d3b9891dbfee502bd3e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Make 'nmake check' succeed for widgets testsMiikka Heikkinen2012-02-171-0/+2
| | | | | | | | | | | | | Marked a bunch of tests insignificant, and skipped one crashing test case in QApplication test, as that couldn't be made to pass simply by marking the test insignificant. Once the underlying issues are fixed, the tests need to be re-enabled. Task-number: QTBUG-24203 Change-Id: I9aea4fa207d307793445efdcaead72219fbf6c4f Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Skip all tst_QFontDialog tests on Mac OS XBradley T. Hughes2012-02-171-0/+10
| | | | | | | | | All of these tests currently hang. Task-number: QTBUG-24321 Change-Id: I7664b57f6539d4c03008701da66e193019a4440a Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Skip hanging tst_QColorDialog test, expect failing test on Mac OS XBradley T. Hughes2012-02-171-0/+6
| | | | | | | | | | tst_QColorDialog::native_activeModalWidget() hangs, so skip this test. tst_QColorDialog::task247349_alpha() fails, so XFAIL this failure. Task-number: QTBUG-24320 Change-Id: Ie4d69e07063e9a648ec4fa3337274143a52ea3e3 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Add palette() and further hints to QtGui/QPlatformTheme.Friedemann Kleint2012-02-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | - Move palette() from deprecated QtWidgets/QGuiPlatformPlugin to QtGui/QPlatformTheme, Make it return a const * since QPalette does not have isNull(). - Initialize QGuiApplication::palette() and QApplication::systemPalette() from it. - Do not initialize QPalette from QGuiApplication::palette() unless app_pal is non-null (default to Qt::black if it is 0). This avoids initialization order crashes/recursions in the QPA plugin. Streamline initialization function. - Remove styleName(), systemIconThemeName() and iconSearchPaths() from QGuiPlatformPlugin and re-add them as QPlatformTheme::themeHint(). - Remove styleHint() from QGuiPlatformPlugin, add it to QPlatformTheme::themeHint(). - Add UNIX themes with factory function (Generic, KDE, Gnome), taking it from Qt 4.8 code (stripping the KDE 3 code). - Implement Windows palettes. Task-number: QTBUG-24204 Change-Id: Ie27ec035df4f84c42deaffc4816b2e53ce705462 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Fix tst_QFileDialog2 for Windows 7.Miikka Heikkinen2012-02-151-9/+35
| | | | | | | | | | | There are no rights for typical user or even administrator to write directly under c:\ root in windows without rights elevation, so completionOnLevelAfterRoot() test case failed. Changed the test case to use an existing directory. Task-number: QTBUG-24289 Change-Id: I6a8dfc9d1d6ae798b3b9049c542b45fdbdbd9a8c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Eliminate duplicate data row names in widgets autotests.Jason McDonald2012-02-151-21/+25
| | | | | Change-Id: I82bab3cc39320014fac6732c7b60233b262cb30d Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Replace Q_WS_WINCE against Q_OS_WINCE.Andreas Holzammer2012-02-091-1/+1
| | | | | | | | | | Window system Macros where deprecated so use Q_OS_WINCE for now. This code will need some refactoring, but this is the first step to it. Change-Id: I5876b80ee45d4b38ac63fc7d51e775dc70bbd485 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove many deprecated methodsLars Knoll2012-01-313-35/+33
| | | | | | | | | | Remove methods that have been marked as deprecated before Qt 4.6. Keep others, but inline them where possible and mark them as QT_DEPRECATED_SINCE(5, 0). Change-Id: If881821ae095f054b31cc13464f19e2007c20ed7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-3014-14/+14
| | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I311e001373776812699d6efc045b5f742890c689 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Expect tst_QWizard::setPixmap() failure on Mac OS XBradley T. Hughes2012-01-231-4/+10
| | | | | | | Task-number: QTBUG-23701 Change-Id: Iba5b926e57c1565856d17bbfbff4d1da75645ad4 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Expect tst_QFileDilaog:clearLineEdit() failure on Mac OS XBradley T. Hughes2012-01-231-0/+3
| | | | | | | Task-number: QTBUG-23703 Change-Id: I981de80d6946d3637c493bede0adb1b90a539261 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Do not expect tst_QFileDialog::selectFiles() failure on Mac OS XBradley T. Hughes2012-01-231-2/+2
| | | | | | | | | | This test no longer fails: XPASS : tst_QFiledialog::selectFiles() '!listView->selectionModel()- Loc: [tst_qfiledialog.cpp(915)] Change-Id: Ib790c0f81b3d383117cceceaacbf0c3d6a673404 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Replace Q_WS_MAC with Q_OS_MAC in tests/auto/widgetsBradley T. Hughes2012-01-236-19/+14
| | | | | | | | tst_qwidget.cpp will not build/link without tst_qwidget_mac_helpers.mm, so re-add it to the build as well. Change-Id: I55130f62c215c4b82683d90456e31fdb09f833a8 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Update contact information in license headers.Jason McDonald2012-01-2314-14/+14
| | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I431bbbf76d7c27d8b502f87947675c116994c415 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Obsolete QInputDialog::getInteger() 'officially'.Robin Burchell2012-01-221-13/+13
| | | | | | | | | It has long since been obsolete in code and removed from the documentation, but was never marked QT_DEPRECATED. Do so, and inline the implementation. Change-Id: Ic7bfdaf76269b7f9addeba83e64bc9525c581dda Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Mark tst_QFileDialog2 failure as expected on Mac OS XBradley T. Hughes2012-01-171-0/+3
| | | | | Change-Id: I678e1c714ac9c376484b4a3a5d9bfd2bd100e685 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Avoid using 'check' as an identifier.Stephen Kelly2012-01-101-4/+4
| | | | | | | Avoids conflict with macro on Mac OS. Change-Id: I79d78283b45bc97032d6a94139ee750ec01e9c0a Reviewed-by: hjk <qthjk@ovi.com>
* Update copyright year in license headers.Jason McDonald2012-01-0514-14/+14
| | | | | Change-Id: I02f2c620296fcd91d4967d58767ea33fc4e1e7dc Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Use true and false in preference to TRUE and FALSE in tests.Jason McDonald2012-01-032-12/+12
| | | | | | | | | Use the C++ boolean constants true and false instead of the C macros TRUE and FALSE (which are actually integers), and use QVERIFY instead of QCOMPARE for verifying simple boolean expressions. Change-Id: Ie76dfcab6722df6b93b3fa62b0f3437901482932 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Silence -Woverloaded-virtual warnings in QFileDialogBradley T. Hughes2011-12-122-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QPaintDevice::init() virtual, reimplemented in QWidget, is hidden by these declarations, and clang (and gcc with -Woverloaded-virtual) warns about this. There is no need to overload the init() name, use more descriptive names instead. dialogs/qsidebar_p.h:124:10: warning: 'QSidebar::init' hides overloaded virtual function [-Woverloaded-virtual] void init(QFileSystemModel *model, const QList<QUrl> &newUrls); ^ dialogs/qfiledialog_p.h:303:10: warning: 'QFileDialogLineEdit::init' hides overloaded virtual function [-Woverloaded-virtual] void init(QFileDialogPrivate *d_pointer) {d_ptr = d_pointer; } ^ dialogs/qfiledialog_p.h:314:10: warning: 'QFileDialogComboBox::init' hides overloaded virtual function [-Woverloaded-virtual] void init(QFileDialogPrivate *d_pointer); ^ dialogs/qfiledialog_p.h:330:10: warning: 'QFileDialogListView::init' hides overloaded virtual function [-Woverloaded-virtual] void init(QFileDialogPrivate *d_pointer); ^ dialogs/qfiledialog_p.h:342:10: warning: 'QFileDialogTreeView::init' hides overloaded virtual function [-Woverloaded-virtual] void init(QFileDialogPrivate *d_pointer); ^ kernel/qwidget.h:682:10: note: hidden overloaded virtual function 'QWidget::init' declared here void init(QPainter *painter) const; ^ Change-Id: I7a317a551b92fde966e61958dcaf25dea94d69b4 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Remove TESTED_CLASS/TESTED_FILES comments from tests.Jason McDonald2011-12-0612-37/+0
| | | | | | | | | These comments were mostly empty or inaccurate. Appropriate naming of tests and appropriate placement of tests within the directory tree provide more reliable indicators of what is being tested. Change-Id: Ib6bf373d9e79917e4ab1417ee5c1264a2c2d7027 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Correct usage of network-settings.h.Jason McDonald2011-11-282-2/+2
| | | | | | | | | Four of the modified files only use functions from network-settings.h on Windows, and the other three files don't use anything from that header. Change-Id: Ifa4b0319d14367735b859e538921fa0eeeccce1a Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* qtbase tests: Fix some warningsFriedemann Kleint2011-11-212-2/+1
| | | | | | | | - Fix warnings about QAtomicPointer/Int usage - Fix some gcc 4.6 warnings about assigned/unused variables Change-Id: Ib4dbf9110f0dad93ad48e97278310f05fad3a82a Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Don't depend on moc to disable test functions.Jason McDonald2011-11-184-29/+31
| | | | | | | | | | | | | | | | | | | | | 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>
* Fix for QMessageBox's autotest.Mikko Knuutila2011-11-141-1/+2
| | | | | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 10:21:30 +0000