summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add an assert before we dereference a null pointerAlan Alpert2009-09-021-0/+1
| | | | Reviewed-by: Aaron Kennedy
* Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-09-0212-34/+44
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-025-64/+118
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Disallow using typenames as idsAaron Kennedy2009-09-0212-34/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is now illegal: import Qt 4.6 Item { id: Item } as is import Qt 4.6 Item { id: Text }
* | | Slightly better name dialog for SameGameAlan Alpert2009-09-021-1/+2
| | |
* | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-09-0210-67/+153
|\ \ \ | | |/ | |/| | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-09-0229-58/+303
| |\ \ | | |/ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-0218-36/+151
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Save object creation line and column numberAaron Kennedy2009-09-025-3/+35
| | | | | | | | | | | | | | | | | | | | This info is used by the debugger interface, and by the qmlInfo() stream.
| * | | Provide some color manipulation functions.Michael Brasser2009-09-025-64/+118
| | | | | | | | | | | | | | | | | | | | These may not be the final location for these, but it allows us to start testing.
* | | | SameGame score XSLT now sorts by score.Alan Alpert2009-09-021-0/+1
| |_|/ |/| |
* | | Don't need to tweet high scores tooAlan Alpert2009-09-021-17/+0
| | |
* | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-09-0216-39/+142
|\ \ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Fixed crash in keyPressed. keyToSignal function suppose to return “const ↵Mehul R. Patel2009-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QbyteArray” not “const char *”. Crash was coming because keyPressed was getting invalid memory pointer from keyToSignal function. Merge-request: 1374 Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * | | Flickable locked property changed to interactive.Martin Jones2009-09-0210-22/+29
| | | | | | | | | | | | | | | | Note that the meaning of the property has been reversed.
| * | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-09-025-12/+108
| |\ \ \ | | | |/ | | |/| | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-021-7/+9
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Add TextInput key handling testAaron Kennedy2009-09-023-0/+107
| | | | |
| | * | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-02131-1546/+2168
| | |\ \ \ | | | | |/ | | | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Remove unused member variables from QmlEnginePrivateAaron Kennedy2009-09-012-12/+1
| | | | |
| * | | | Clear animation only in the direction being fixed in fixupX/Y.Martin Jones2009-09-021-4/+4
| | |_|/ | |/| |
* | | | SameGame now asks for a name and saves your score.Alan Alpert2009-09-023-13/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Included a rewriting of the Dialog item to be half-decent. Watch http://qtfx-nokia.trolltech.com.au/samegame/scores.php on the internal network for highscores!
* | | | SameGame high score server support.Alan Alpert2009-09-025-1/+109
|/ / / | | | | | | | | | | | | | | | This commit contains all the functionality for sending high scores to a server, and the server. The server files have been installed at http://qtfx-nokia.trolltech.com.au/samegame for internal testing.
* | | Fix propertyValueSource testMartin Jones2009-09-021-7/+9
| |/ |/|
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-09-0142-1114/+746
|\ \ | | | | | | | | | kinetic-declarativeui
| * | Rewrite of DirectFB locking mechanismAnders Bakken2009-09-019-92/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DirectFB allows you to have a locked subSurface that remains valid while you paint on the unlocked "parent" surface. The only limitation is that when accessing the locked memory you might have to call DirectFB->WaitIdle() in case pending GPU operations aren't finished. After this we keep the locked surface around at all times (from the first time it's requested) until the surface dies. Previous calls to lock() will just call WaitIdle if necessary and previous calls to unlock now just mark the surface as dirty and in need of a WaitIdle if someone needs to access its pixel data. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | Make DirectFB compile with Qt in a namespaceAnders Bakken2009-09-015-43/+38
| | | | | | | | | | | | Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | Add DirectFB to QScreenDriverFactoryAnders Bakken2009-09-011-2/+7
| | | | | | | | | | | | Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * | Add directfb.pri to embedded.priAnders Bakken2009-09-011-0/+4
| | | | | | | | | | | | Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | Copy directfb.pro to src/gui/embedded/directfb.priAnders Bakken2009-09-012-35/+41
| | | | | | | | | | | | Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | Add directfb to CFG_GFX_AVAILABLEAnders Bakken2009-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | | This is a first step in making it possible to build DirectFB as part of QtGui. Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | Don't check for null if never happens, but test it if it may...João Abecasis2009-09-011-4/+4
| | | | | | | | | | | | | | | | | | Making coverity happy. Reviewed-by: Olivier Goffart
| * | Merge branch '4.5' into 4.6Thiago Macieira2009-09-013-14/+12
| |\ \ | | | | | | | | | | | | | | | | Conflicts: examples/qws/dbscreen/dbscreen.cpp
| | * | Fix Solaris build: test isn't test.Thiago Macieira2009-09-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | configure: test: argument expected Reviewed-by: TrustMe
| | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5David Boddie2009-09-017748-96818/+117974
| | |\ \
| | | * \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-09-018-728/+67
| | | |\ \
| | | * | | Fix misformatted license headers.Jason McDonald2009-09-015-59/+44
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | Doc: Fixed broken links to renamed functions.David Boddie2009-09-011-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | Autotest which checks you can paint to an fbo in a gl widget's p.e.Tom Cooksey2009-09-011-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test mimics examples/opengl/framebufferobjects in that it begins a QPainter on a QGLWidget in it's paint event, then begins a second QPainter on a QGLFramebufferObject, leaving 2 painters active at the same time. When the FBO's painter is ended, GL rendering should be re-targetted at the QGLWidget automatically.
| * | | | | Don't seg-fault when printing error message in shader managerTom Cooksey2009-09-011-11/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's very likely that some of the shader objects in required program will be null, as not all are manditory. Check to see if they exist before de-referencing them and asking for their log string. Reviewed-by: Trustme
| * | | | | Merge branch '4.5' into 4.6Thiago Macieira2009-09-018-729/+67
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/network/access/qnetworkaccessbackend.cpp src/network/access/qnetworkreplyimpl.cpp tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
| | * | | | Make the existence of the LICENSE.GPL3 file optionalThiago Macieira2009-09-013-703/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The repository no longer carries this license. The final releases will still have it. In any case, the LGPLv2.1 is compatible with the GPLv3. Required-By: Nokia Legal Reviewed-by: Marius Storm-Olsen
| | * | | | Re-add check for saving to cache, which was removed by accident.Thiago Macieira2009-09-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Discussed with Ben Meyer.
| | * | | | QNetworkAccessManager can delete the QAbstractNetworkCache pointer atBenjamin C Meyer2009-09-015-21/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | any point. Rather then keep a separate pointer to the cache in the reply use the pointer kept by the manager so the reply never tries to access a cache pointer that has already been deleted. Autotest: included Merge-request: 1124 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * | | | Use the QDesktopServices::CacheLocation to determine the location to store ↵Benjamin C Meyer2009-09-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the temporary cache rather than QDesktopServices::DataLocation Merge-request: 1124 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * | | | Initialize QNetworkAccessBackend's private variables to 0 in the constructorBenjamin C Meyer2009-09-011-2/+7
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | and when creating a CacheBackend set the manager pointer. Merge-request: 1124 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | | QScriptEngineAgent autotest bug fixJedrzej Nowacki2009-09-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default value for script id in tests should be <-1, because -1 mean that there is no script and all numbers >0 are valid. Two test cases were marked as expected to fail. Reviewed-by: TrustMe
| * | | | QNAM HTTP Code: Removed unnecessary legacy loopMarkus Goetz2009-09-011-23/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thank you Coverity! Thank you Biochemist! Reviewed-by: joao
| * | | | Doc: Stylesheet min/max-width/height are relative to the box content.Geir Vattekar2009-09-011-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 235550 Reviewed-by: Olivier Goffart
| * | | | Speed-up parsing of SVG path data.Ariya Hidayat2009-09-011-117/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using operations that shuffle the array of numbers, just use pointer to iterate the numbers. This reduced the amount of memory operations during the parsing. In addition, parse the numbers to QVarLengthArray instead of QVector. This works well because usually a path element is typically followed by a short list of numbers. Loading tiger.svg (tests/benchmarks/qsvgrenderer) is now 8% faster, mostly due to the time spent in parsePathDataFast is reduced from 26.1 millions instructions to just 20.5 millions (27% speed-up). Reviewed-by: Kim