summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Suppress some compiler warnings that occur under OpenGL/ES 2.0Rhys Weatherley2009-09-282-0/+6
| | | | Reviewed-by: trustme
* QGLContext::drawTexture() is not supported under OpenGL/ES 2.0Rhys Weatherley2009-09-281-2/+15
| | | | Reviewed-by: trustme
* ifdef out convolution filter for OpenGL/ES 2.0Rhys Weatherley2009-09-281-2/+14
| | | | | | | | Convolution filter is not compatible with OpenGL/ES 2.0 in its current form, and we probably don't need it now that we have a special-purpose blur filter. Reviewed-by: trustme
* Make the GL graphics system work under OpenGL/ES 2.0Rhys Weatherley2009-09-281-4/+69
| | | | | | | Very basic port of the graphics system - performance may not be the best just yet. Reviewed-by: Sarah Smith
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-285-16/+72
|\
| * QSQL; Precision Policy - update test to reflect passing status.Justin McPherson2009-09-281-4/+0
| | | | | | | | Reviewed-by: Bill King
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sarah Smith2009-09-283-6/+66
| |\
| | * Improved audio unit testsKurt Korbatits2009-09-282-2/+66
| | | | | | | | | | | | | | | | | | Added more checking in each step of the playback or recording tests. Reviewed-by:Justin McPherson
| | * Removed stateChanged and notify signals from win32 qaudiooutput builtin.Kurt Korbatits2009-09-271-4/+0
| | | | | | | | | | | | | | | | | | stateChanged and notify signals are inherited from base class. Reviewed-by:Bill King
| * | Fix doc break in examples/helloglSarah Smith2009-09-281-6/+6
| |/ | | | | | | | | | | Snippets pointing to moved code - now fixed. Reviewed-by: TrustMe
* | qdoc fixes to QGLFramebufferObject::blitFramebuffer()Rhys Weatherley2009-09-281-6/+11
|/
* Doc: Removed the What's New page for Designer and fixed indentation.David Boddie2009-09-252-120/+2
| | | | Reviewed-by: Trust Me
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Jeremy Katz2009-09-2561-281/+1793
|\
| * Doc: Added some notes to help people implement custom models.David Boddie2009-09-251-3/+9
| | | | | | | | Reviewed-by: Trust Me
| * Doc: Added a note about Phonon.David Boddie2009-09-251-0/+4
| | | | | | | | Reviewed-by: Trust Me
| * Fix compilation of files that #include <QtGui> on newer Symbian SDKs.Jason Barron2009-09-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | The new public classes in the 's60framework' sub-directory of QtGui introduce a header file dependency to the middleware layer of the SDK by including 'aknapp.h'. Since the build system doesn't know if you have included QtGui or not, the closest approximation is to append the middleware layer include path in cases where the QT variable contains 'gui' Reviewed-by: axis
| * Process could not be located on WindowsCEninerider2009-09-252-5/+20
| | | | | | | | | | | | | | The SRCDIR entry was added to the project file to correct the deployment for WindowsCE. Also the process start is now monitored in the test. Reviewed-by: Joerg
| * Individual targets for the test processes definedninerider2009-09-252-23/+81
| | | | | | | | | | | | | | The deployment for Windows CE did not work as the processes could not be located properly on the device. Reviewed-by: banana joe
| * Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-09-2515-43/+56
| |\
| | * Added "requires qtscript" to qsystemsemaphore test in S60 and WinCE.Janne Anttila2009-09-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qsystemsemaphore autotest does not compile for S60 and WinCE without QtScript and QtScript currently does not compile for S60, that's why the following statement was added to pro file: requires(contains(QT_CONFIG,script)) Reviewed-by: TrustMe
| | * Added "requires qtscript" to qsharedmemory test pro in S60 and WinCE.Janne Anttila2009-09-252-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qsharedmemory autotest does not compile for S60 and WinCE without QtScript and QtScript currently does not compiled for S60, that's why the following statement was added: requires(contains(QT_CONFIG,script)) Reviewed-by: TrustMe
| | * Skipped QProcess::setProcessEnvironment auto test for Symbian.Janne Anttila2009-09-251-3/+4
| | | | | | | | | | | | | | | | | | Symbian OS doesn't support environment variables. Reviewed-by: Miikka Heikkinen
| | * Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-252-9/+19
| | |\
| | | * browser demo: Disable debug logging in release modeTor Arne Vestbø2009-09-251-0/+2
| | | |
| | | * Fixed crash with QPixmap::fill() when pixmap is painted to using opengl1Gunnar Sletta2009-09-251-9/+17
| | | | | | | | | | | | | | | | Reviewed-by: Samuel
| | * | Clean-up for qprocess autotest since default stack in S60 is now 80K.Janne Anttila2009-09-251-16/+0
| | |/ | | | | | | | | | | | | | | | | | | | | | Specialized test code to set higher stack for this test case is not needed anymore since default stack for Qt thread in S60 now is 80 KB. See commit: 9324fdde Reviewed-by: TrustMe
| | * Move selfsigned cert & key out of root directoryShane Kearns2009-09-253-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Moved the certificate/key to the src/s60installs path. Updated createpackage.pl to look in this new location. Task-number: QTBUG-4553 Reviewed-by: axis
| | * Doc: Document that iterators become invalid when the container is modified.Volker Hilsheimer2009-09-251-1/+4
| | | | | | | | | | | | | | | Implicit sharing makes this a bit of a trap, since the iterator continues to function, but only on the data in the copies.
| | * doc: Update browser demo screenshotTor Arne Vestbø2009-09-251-0/+0
| | |
| | * browser: Don't add closed tabs to the closed-tab history in privacy modeTor Arne Vestbø2009-09-251-4/+7
| | | | | | | | | | | | | | | Task-number: QTBUG-4508 Reviewed-by: Simon Hausmann
| | * tst_qfilesystemwatcher directory changed test relaxedmread2009-09-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | The polling watcher was generating two events for directory content deletion on Symbian emulator. 1 for content change, 1 for time change. Seems within the bounds of reason for a poller, so test relaxed to allow it. Reviewed-by: Liang QI
| | * Doc: Point out that not all DBMS'es can be expected to function equally well.Volker Hilsheimer2009-09-251-2/+9
| | | | | | | | | | | | | | | In particular, MSSQL, DB2 and Sybase suffer from cross-platform and feature complete client libraries.
| | * Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-2525-118/+494
| | |\
| | * | Made QDir::tempPath and QDesktopServices::TempLocation consistent in S60Janne Anttila2009-09-251-4/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe Autotest: Fixes qdesktopservices::storageLocation test
| * | | Desktopservices demo no longer attempts to play music files in emulatorMiikka Heikkinen2009-09-251-3/+14
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Since Symbian emulator support for playing music files is spotty at best, resulting in failure to launch at best and freezing of the emulator at worst, disabled even trying to launch music files. Task-number: QT-2047 Reviewed-by: Janne Koskinen
| * | Replacing QPointer usage with QWeakPointer in statemachineLeonardo Sobral Cunha2009-09-253-7/+7
| | | | | | | | | | | | Reviewed-by: thierry
| * | Use qDebug() instead of printf() when dumping the simplex matrix.Jan-Arve Sæther2009-09-252-12/+11
| | | | | | | | | | | | | | | | | | printf() does not work very well on windows, since it will not send the output to OutputDebugString(). This allows us to catch the output even if the program is configured without "CONFIG += console".
| * | Fixed the image comparison tests for Windows Mobile 5ninerider2009-09-253-3/+14
| | | | | | | | | | | | | | | | | | | | | The image comparison reference snapshots were not up to date. Also the comparison ignores the title bar completely. Reviewed-by: banana joe
| * | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-09-2530-162/+1558
| |\ \
| | * | Fix app showing a blank screen after switching to it using task switcherShane Kearns2009-09-251-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On S60, the widget backing store is dropped when app window is hidden in order to save memory. This has a side effect that the widgets are not redrawn when the backing store is recreated if they have static content. Fix is to invalidate the backing buffer after recreating it, and repaint the widget. Reviewed-by: Jason Barron
| | * | Stop fluidlauncher timers when in background to save batteryShane Kearns2009-09-254-8/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed fluidlauncher to use a stacked widget instead of two top level windows. Used the ActivationChange event to get notification from the OS window system when fluidlauncher is active. Slideshow related timers are stopped when the window is deactivated and restarted when activated. Task-number: QT-886 Reviewed-by: Alessandro Portale
| | * | QGraphicsAnchorLayout: Enable boundary feasibility testEduardo M. Fleury2009-09-251-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test would trigger random Q_ASSERT failures but should work fine after the previous commit. Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
| | * | QGraphicsAnchorLayout: Fix bug where simplex would return wrong resultsEduardo M. Fleury2009-09-251-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Jan-Arve found a bug where QSimplex would return bad results in some tight situations. The problem was triggered randomly but the chances of appearance were higher in problems with only one feasible solution, ie. problems what were in the boundary of feasibility. The QSimplex solver implements a two-phase simplex solver, the first phase is responsible for finding a _feasible_ solution for the problem (not the best one). The second phase starts with the basic feasible solution (just found) and changes until one that is _optimal_ is found. To implement that solution we need to add artificial variables to the original problem, before phase 1, and remove them, before starting phase 2. Unfortunately though, there was some randomness in the criteria used by the solver that would sometimes cause the removal of a good variable instead of an artificial one, between the phases. With one good variable missing, the solver would also miss an important restriction, without such, it would push the objective function too far, thus returning a "wrong" result. This commit adds a tie-breaker condition to the pivot row logic to ensure the artificial variables are removed before the "good" ones. Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
| | * | QSimplex: Add class and methods documentationEduardo M. Fleury2009-09-251-5/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This private class is used by QGraphicsAnchorLayout as the linear programming solver engine. This method adds documentation to implementation, method and classes. Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
| | * | QGraphicsAnchorLayout: Adding hasConflicts() verifications on anchor testsJesus Sanchez-Palencia2009-09-251-0/+29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
| | * | QGraphicsAnchorLayout: Removing memory leaks on anchor testsJesus Sanchez-Palencia2009-09-251-0/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
| | * | QGraphicsAnchorLayoutPrivate: Avoiding graph simplification on empty layoutsJesus Sanchez-Palencia2009-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
| | * | QGraphicsAnchorLayout: enabled hasConflicts() test on autotestJesus Sanchez-Palencia2009-09-251-5/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> Reviewed-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
| | * | Merge branch 'origin/4.5' into 4.6Oswald Buddenhagen2009-09-252-11/+83
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: translations/qt_ru.ts
| | | * | Add Russian translation for Qt DesignerRitt Konstantin2009-09-252-1/+7033
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1611 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>