summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-09-0824-54/+608
|\
| * Added an option to the lexer to tell the engine of all comments in a QMLErik Verbruggen2009-09-086-6/+28
| * Compilefix for win32Thomas Hartmann2009-09-081-4/+4
| * Fix crash on QGraphicsItem destruction related to focus handling (redone)Kai Koehne2009-09-081-1/+3
| * Don't use qt3support methodsAaron Kennedy2009-09-081-1/+1
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-09-08405-4862/+4983
| |\
| | * Current Item was moved twice when an item was inserted before it.Martin Jones2009-09-081-1/+2
| | * Rest of change 28ccffc53df374f7b890510f481e2dae2e01ed74Warwick Allison2009-09-083-10/+288
| | * Missed icons.Warwick Allison2009-09-083-0/+0
| | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-09-08393-4850/+4528
| | |\
| | * | Dynamic QmlListModelWarwick Allison2009-09-082-0/+129
| * | | DocAaron Kennedy2009-09-085-28/+149
| * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-09-0731-373/+243
| |\ \ \
| * | | | DocAaron Kennedy2009-09-042-4/+5
* | | | | Don't add newlines in rewriter as it messes up error reporting.Michael Brasser2009-09-081-2/+2
* | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-09-083-66/+197
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Texture format must be GL_RGB when pixel type is GL_UNSIGNED_SHORT_5_6_5Rhys Weatherley2009-09-081-0/+1
| * | | | Make the matrix and viewport logic in renderText() a bit betterRhys Weatherley2009-09-081-50/+137
| * | | | Convert QGLFramebufferObjectFormat to use implicit sharingRhys Weatherley2009-09-082-16/+59
* | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-09-08375-4809/+4343
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Martin Jones2009-09-08372-4807/+4245
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fixed the spelling of canceled in the QGesture api brought up by David Boddie.Denis Dzyubenko2009-09-072-6/+6
| | * | | | Only depend on phonon when building webkit if phonon was configured forAndy Shaw2009-09-071-1/+2
| | * | | | Remove extra invalid semi-colonThiago Macieira2009-09-071-1/+1
| | * | | | Fixed compile failure on Mac OS X.Samuel Rødal2009-09-071-2/+1
| | * | | | Network tests: Fix typo in network-settings.h to make it compileMarkus Goetz2009-09-071-1/+1
| | * | | | tst_qnetworkreply: Check for NoError before event loop timeout.Markus Goetz2009-09-071-0/+7
| | * | | | Use icons on QDialogButtonBox in KDEJens Bache-Wiig2009-09-074-15/+52
| | * | | | Fix warning when compiling with QT_NO_EXCEPTIONSOlivier Goffart2009-09-071-1/+1
| | * | | | Fix a crash in the Win32 event dispatcherBradley T. Hughes2009-09-071-0/+2
| | * | | | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-0719-80/+283
| | |\ \ \ \
| | | * | | | Fix crash on QGraphicsItem destruction related to focus handlingKai Koehne2009-09-071-1/+1
| | | * | | | Doc: Minor adjustments to the rogue example docs.Geir Vattekar2009-09-071-8/+8
| | | * | | | Fix QScriptEngineAgent::functionExit (JIT enabled)Jedrzej Nowacki2009-09-073-17/+4
| | | * | | | Fix QScriptEngineAgent::exceptionCatch (JIT enabled)Jedrzej Nowacki2009-09-073-5/+4
| | | * | | | Doc: Added a note that a state machine requires a running event loop.David Boddie2009-09-072-31/+26
| | | * | | | Fixed crash in print preview dialog with graphicssystem OpenGL.Kim Motoyoshi Kalland2009-09-071-17/+18
| | | * | | | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-09-0714-28/+473
| | | |\ \ \ \
| | | | * | | | Doc: Some animation examples had no docs in qtdemo.Geir Vattekar2009-09-0710-1/+208
| | | * | | | | Re-added Symbian specific plugins documentation that had gotten lost.Miikka Heikkinen2009-09-071-0/+14
| | * | | | | | Minor fix to network-settings.h in Symbian OSJanne Anttila2009-09-071-5/+4
| | | |/ / / / | | |/| | | |
| | * | | | | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-077-17/+296
| | |\ \ \ \ \
| | | * | | | | New Benchmark: file:// with QFile vs QNetworkAccessManagerMarkus Goetz2009-09-073-0/+172
| | | |/ / / /
| | | * | | | Fix some issues with Shift-selection in QAbstractItemViewFrank Reininghaus2009-09-072-4/+114
| | | * | | | Fix tst_QListView::task254449_draggingItemToNegativeCoordinates on MacOlivier Goffart2009-09-071-12/+8
| | | * | | | Fix for qfileinfo autotest: LocalDiskFile set also for non-existing filev4.6.0-tp1aavit2009-09-071-1/+2
| | * | | | | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-09-07161-653/+1774
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Fixed qsubmdiarea setFont test.Gabriel de Dietrich2009-09-071-1/+4
| | | * | | | Fix tst_QItemDelegate::task257859_finalizeEdit on MacOlivier Goffart2009-09-071-1/+1
| | | * | | | Fixed resolving colors of the form "rgb(r,g,b)" in SVGs.Kim Motoyoshi Kalland2009-09-071-10/+13