summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed qstatemachine autotest compilaton for Symbian OS.Janne Anttila2009-08-111-8/+8
| | | | | | | | Apparently Nokia X86 compiler is not able to use templated qCompare when given arguments have different different type but same base class. This error should be isolated and reported to Nokia X86 team. See task: 259508
* Fixed qlocale autotest compile error for Symbian.Janne Anttila2009-08-111-1/+1
|
* Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-1113-455/+107
|\
| * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-1110-450/+102
| |\
| | * Added default IAP checking to tst_qnetworkaccessmanager_and_qprogressdialog.Miikka Heikkinen2009-08-111-1/+8
| | |
| | * Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-1125-503/+236
| | |\
| | | * Refactor S60 related changes to QGraphicsItem / QGraphicsView.Andreas Aardal Hanssen2009-08-112-133/+44
| | | | | | | | | | | | | | | | | | | | | | | | The change mostly removes duplication and does minor touchups. Reviewed-by: axis
| | | * test slots are not constHarald Fernengel2009-08-111-38/+38
| | | |
| | | * Removed qkeyevent autotest.axis2009-08-113-269/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This test hasn't been updated in years, and never worked in the first place. RevBy: Trust me
| | * | RVCT didn't like a test bool variable exported directly from QtGui,Miikka Heikkinen2009-08-113-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | causing applications to panic with KERN-EXEC 3. Fixed by providing accessor for the bool in question instead of exporting it directly. Note: Unknown why exactly this panic occurs, as exporting bools works just fine when tested with small test executable + dll. Something in QtGui causes this to fail; I suspect it might be the massive code segment size and relocation of the data segment that is contributing to this problem. RevBy: Jason Barron
| * | | Fixed qpropertyanimation autotest build for win32-msvc2008.Janne Anttila2009-08-111-1/+1
| | | |
| * | | Removed unneccessary QHostAddress cast from tst_qnativesocketengine.cppJanne Anttila2009-08-111-3/+3
| | |/ | |/| | | | | | | The cast/constructor is not needed anymore due to commit 5b80fbad.
| * | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-112-4/+8
| |\ \
| * | | Fixed qsocketnotifier autotest compilation for win32-msvc2008 platform.Janne Anttila2009-08-111-1/+1
| | | |
* | | | Fixed qline autotest merge, tst_qline.cpp was added twice to SOURCES.Janne Anttila2009-08-111-1/+0
| |/ / |/| |
* | | Fixed SRCDIR for qxmlquery autotest for SymbianJanne Anttila2009-08-112-4/+8
|/ /
* | Switched QtNetworkSetting to use 'qt-test-server' config by default.Janne Anttila2009-08-111-5/+6
| | | | | | | | | | | | | | | | Qt/Master uses qt-test-server config by default but our S60/master was configure to use different server by default. The assumption is that this caused several QtNetwork autotests to fail when testing QtS60 branch on other configurations in QtSW premises. This because the old test server was very likely unavailable...
* | Fixed KERN-EXEC 3 crash in qdesktopwidget for S60.Janne Anttila2009-08-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDesktopWidgetPrivate::rects etc variables are shared between QDesktopWidgetPrivate objects and private objects maintains refcount to data. We called cleanup for private object directly from QDesktopWidget, which caused the shared private data to be freed after some instance of QDesktopWidget was destroyed. Since we bypassed the refcount also the data for other QDesktopWidgets was invalidated and this cauyse crash when resizeEvent was received. There is no need to call QDesktopWidgetPrivate::cleanup directly since when QDesktopWidget is deleted, it will call destructor for QDesktopWidgetPrivate which deletes the shared data based on ref count.
* | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-11366-1824/+7209
|\ \
| * | Add comparison operators also to subclassesHarald Fernengel2009-08-102-2/+59
| | | | | | | | | | | | | | | Compiler would for some reason choose operator bool() instead when comparing subclasses of QScopedPointer.
| * | s/class/struct/Harald Fernengel2009-08-101-1/+1
| | | | | | | | | | | | | | | Stop confusing MSVC by correctly forward declare QScopedPointerDeleter as struct
| * | add operator! to QScopedPointerHarald Fernengel2009-08-102-0/+13
| | |
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicmread2009-08-10354-1800/+7093
| |\ \ | | |/
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-101-2/+2
| | |\
| | | * Make eventloop autotest compile for windows.Liang Qi2009-08-101-2/+2
| | | |
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-103-6/+16
| | |\ \ | | | |/
| | * | Merge commit 'qt/master'Jason Barron2009-08-1029-109/+208
| | |\ \
| | | * | Moved tests/auto/runQtXmlPatternsTests.sh to devtools/shellLeonardo Sobral Cunha2009-08-101-61/+0
| | | | |
| | | * | Remove unused member.Jan-Arve Sæther2009-08-101-1/+0
| | | | |
| | | * | Whitespace cleanupJan-Arve Sæther2009-08-101-3/+3
| | | | |
| | | * | Fix default QWidget size on X servers with XineramaBradley T. Hughes2009-08-101-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default widget size is normally calculated from the root window size, but when running on an X server with Xinerama enabled, the root window spans all screens, making the widget far to large. Use the default screen's size instead to give the widget a size that should fit on a single screen.
| | | * | Link with winscw againHarald Fernengel2009-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | compiler mangles "struct" and "class" differently, so make sure that QTestCharBuffer is always forward declared as "struct".
| | | * | Xml patterns: remove line in .pro file that added the schematron dirPeter Hartmann2009-08-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this line was dragged in from the Xml schema branch, but there is no schematron in Qt. Reviewed-by: TrustMe
| | | * | Remove spurious paranthesis in container docshjk2009-08-101-1/+1
| | | | |
| | | * | Add QBENCMARK_ONCE to QTestLib.Morten Sorvig2009-08-106-5/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code block associated with QBENCHMARK_ONCE macro will only be executed once, whether the backend returns a valid result or not. The "-iterations" command line argument is also ignored. This is useful for benchmarking code that has side effects. Revby: jasplin
| | | * | Make QTimeLine::start() restart from the beginning as the documentation says.David Faure2009-08-102-6/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation implies that start restarts. Which it did, but only if the timeline was finished _and_ the duration hadn't been changed meanwhile. So after a setDuration(), start() would do nothing, which was unexpected. Merge-request: 1145 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| | | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtKeith Isdale2009-08-10246-1378/+3236
| | | |\ \
| | | | * | Emit axisChanged() when the QGraphicsRotation3D axis changes.Rhys Weatherley2009-08-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Aaron Kennedy
| | | | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtRhys Weatherley2009-08-101-2/+2
| | | | |\ \
| | | | | * | Make checksdk give a nonzero exit code when it's asked for an SDK whichRohan McGovern2009-08-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isn't available. Reviewed-by: Michael Goddard
| | | | * | | Set default QGraphicsTransform3D axis to (0, 0, 1)Rhys Weatherley2009-08-102-12/+47
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The docs said that the default axis was (0, 0, 1), but the code and unit tests were using (0, 0, 0). Modify the code to match the docs because (0, 0, 0) is not very useful. Also optimize the calculation of sin/cos values for 90, 180, and 270 degrees. Reviewed-by: Aaron Kennedy
| | | | * | Add a private function for conversion a QPixmap into a VGImageRhys Weatherley2009-08-101-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Custom OpenVG pixmap filters written by users will need to access the VGImage form of a QPixmap. The qPixmapToVGImage() function is provided for this purpose, as a private API. Reviewed-by: Sarah Smith
| | | * | | In a .pro file the include() function does not warn if specified fileKeith Isdale2009-08-1013-16/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can not be found change that behavior to warn by default. Currently the default behavior of include() in a .pro file is not to warn if the supplied file argument can not be found which can lead to hard to find build errors. The include() will now,by default, warn if the specified file can not be found. If a warning is not required because the included file is optional then example use in the .pro file: include(SomePriFile.pri", "", true) Task-number:259398 Reviewed-by:Marius Storm-Olsen
| | * | | | Merge commit 'qt/master-stable'Jason Barron2009-08-10327-1691/+6885
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/tools/qsharedpointer_impl.h src/gui/widgets/qdatetimeedit.cpp src/gui/widgets/qlinecontrol.cpp src/gui/widgets/qlineedit.cpp tests/auto/qcssparser/qcssparser.pro tests/auto/qicoimageformat/tst_qicoimageformat.cpp tests/auto/qmultiscreen/qmultiscreen.pro tests/auto/qresourceengine/qresourceengine.pro tests/auto/qresourceengine/tst_qresourceengine.cpp tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
| | | * | | QItemSelectionModel did not send selectionChanged signal when deleting an itemGabriel de Dietrich2009-08-073-1/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in a tree-like model with one of its grand-children being selected. Added recursive deselection for the model. Task-number: 232634 Reviewed-by: thierry
| | | * | | Fix compiler error on GCC 4.2.0 mips/sh3Anders Bakken2009-08-071-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this patch gcc would fail with this message: internal compiler error: in add_virtual_operand, at tree-ssa-operands.c:1317 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@nokia.com>
| | | * | | Fix build warningHarald Fernengel2009-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gcc was complaining about format string not being a string literal. Also fixes the small chance that error messages would be bogus if they contain printf control characters. Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
| | | * | | Don't crash if we are drawing an empty image.Jan-Arve Sæther2009-08-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: gunnar
| | | * | | Refactor QTestCharBuffer a bitHarald Fernengel2009-08-0715-218/+257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a static buffer for small strings, and making it oom safe. We can now see messages up to 512 bytes even if we run out of memory (important for OOM tests). Also, testlogging (< 512 bytes per line) should again work without a single allocation. Reviewed-By: Rohan McGovern <rohan.mcgovern@nokia.com>
| | | * | | Doc - Removing trailing whitespacesKavindra Devi Palaraja2009-08-071-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe