Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | qdoc3: Removed const from static cast. | Martin Smith | 2009-05-13 | 1 | -1/+1 |
| | |||||
* | Work with no initial file (open dialog). | Warwick Allison | 2009-05-13 | 2 | -4/+7 |
| | | | | Resize correctly on open new file. | ||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-05-12 | 19 | -11/+1502 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Martin Smith | 2009-05-12 | 17 | -9/+1498 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Alexis Menard | 2009-05-12 | 17 | -9/+1498 |
| | |\ | | | | | | | | | | | | | kinetic-declarativeui | ||||
| | | * | Replace all instances of "Ctrl+Q" with QKeySequence::Quit. | Norwegian Rock Cat | 2009-05-12 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | We introduce this new enum, we should be using it. | ||||
| | | * | Add the chart utility from qtestlib-tools. | Morten Sørvig | 2009-05-12 | 13 | -1/+1479 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is now possible run the benchmarks with "-chart" to generate charts for benchmarks that produce chartable data. See examples/qtestlib/tutorial5 for an example. This patch has minimal inpact on QTestLib itself. Most of the functionality is implemented in a separate tool which QTestLIb calls after detecting the chart command line option. | ||||
| | | * | Merge branch '4.5' | Thiago Macieira | 2009-05-11 | 1 | -2/+4 |
| | | |\ | |||||
| | | | * | Update the --help output of qdbusxml2cpp. | Thiago Macieira | 2009-05-11 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't say we produce output when no options are passed if we don't. Task-number: 222778 Reviewed-by: Trust Me | ||||
| | | * | | Compile on Mac OS X. | Norwegian Rock Cat | 2009-05-11 | 1 | -3/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The friend thing doesn't really work when it's defined in the class you want to be a friend of, so do the promotion technique instead. Reviewed-by: Thierry Bastian | ||||
| | | * | | QToolBarLayout and QDockWidgetLayout, which are private classes, are | Thierry Bastian | 2009-05-08 | 1 | -4/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no more exported designer was using QToolBarLayout members. We fixed that by using styles. Reviewed-by: Friedemann Kleint Reviewed-by: ogoffart | ||||
| * | | | | qdoc: Fixed some qdoc errors. | Martin Smith | 2009-05-12 | 2 | -2/+4 |
| |/ / / | |||||
* | | | | Allow extra video recording args on cmdline. | Warwick Allison | 2009-05-12 | 3 | -3/+27 |
|/ / / | |||||
* | | | Fix resizing and skinning. | Warwick Allison | 2009-05-11 | 2 | -38/+38 |
| | | | | | | | | | | | | Broke with mainwindow introduction. | ||||
* | | | Make sure qmlviewer uses raster graphcis system, or respects what was | Michael Brasser | 2009-05-08 | 1 | -6/+12 |
| | | | | | | | | | | | | input. | ||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-05-07 | 3 | -29/+59 |
|\ \ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Menus for video recording | Warwick Allison | 2009-05-07 | 3 | -29/+59 |
| | | | | | | | | | | | | | | | | QProgressDialog not very good. | ||||
* | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-05-07 | 5 | -60/+163 |
|\ \ \ \ | |/ / / |/| / / | |/ / | kinetic-declarativeui | ||||
| * | | Merge branch '4.5' | Thiago Macieira | 2009-05-07 | 5 | -60/+163 |
| |\ \ | | |/ | | | | | | | | | | | | | Conflicts: src/gui/painting/qbackingstore.cpp src/gui/painting/qwindowsurface_raster.cpp | ||||
| | * | Compiler warnings (Mac/Carbon) | Bjoern Erik Nilsen | 2009-05-07 | 1 | -1/+1 |
| | | | | | | | | | | | | Reviewed-by: nrc | ||||
| | * | Make the error dialogs less annoying. Show only one instead of many. | kh | 2009-05-07 | 1 | -11/+37 |
| | | | |||||
| | * | Implement new cmd option to remove the full text search index. | kh | 2009-05-07 | 3 | -0/+46 |
| | | | |||||
| | * | Cleanup, no functional change. | kh | 2009-05-07 | 1 | -48/+79 |
| | | | |||||
* | | | Tweaks to viewer. | Michael Brasser | 2009-05-07 | 3 | -6/+34 |
| | | | |||||
* | | | Add missing 'Quit' menu item. | Yann Bodson | 2009-05-07 | 1 | -0/+6 |
| | | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-05-07 | 4 | -15/+43 |
|\ \ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-05-06 | 4 | -15/+43 |
| |\ \ \ | | |/ / | | | | | | | | | kinetic-declarativeui | ||||
| | * | | Merge branch '4.5' of git@scm.dev.troll.no:qt/qt | Simon Hausmann | 2009-05-06 | 4 | -15/+43 |
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac_p.h src/gui/widgets/qmainwindow.cpp | ||||
| | | * | Put the Dochwidget tabs on top as this was often requested. | kh | 2009-05-06 | 1 | -0/+1 |
| | | | | |||||
| | | * | Fixes broken last tab page handling in case the search was hidden. | kh | 2009-05-06 | 4 | -15/+42 |
| | | | | |||||
* | | | | Add simple menubar to qmlviewer. | Yann Bodson | 2009-05-07 | 3 | -10/+47 |
|/ / / | |||||
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-05-05 | 3 | -53/+81 |
|\ \ \ | |/ / | | | | | | | kinetic-declarativeui | ||||
| * | | Show the BGR mode in the titlebar of the qvfb window. | Paul Olav Tvete | 2009-05-05 | 1 | -1/+10 |
| | | | | | | | | | | | | | | | | | | Slightly hacky, but isolated change. Reviewed-by: Tom | ||||
| * | | make quote/escape parsing more qmake-compatible | Oswald Buddenhagen | 2009-04-29 | 1 | -50/+67 |
| | | | |||||
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-04-29 | 1 | -2/+4 |
| |\ \ | | |/ | |||||
| | * | Fix compile failure on Visual C++ 6. | Jason McDonald | 2009-04-29 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | No need to be excessively clever here. Reviewed-by: Trust Me | ||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-05-05 | 7 | -495/+96 |
|\ \ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-05-05 | 3 | -2/+87 |
| |\ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-05-05 | 3 | -492/+8 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | Improve QML documentation viewing in Assistant. | Michael Brasser | 2009-05-05 | 3 | -2/+87 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The element pages now load correctly. A separate QML 'book' is also generated, which will be targeted at non-C++ programmers. | ||||
| * | | | | | Remove qmlconv | Aaron Kennedy | 2009-05-05 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
| * | | | | Remove QML XML support | Aaron Kennedy | 2009-05-05 | 2 | -492/+0 |
| | | | | | |||||
| * | | | | Improve error handling consistency | Aaron Kennedy | 2009-05-05 | 1 | -0/+8 |
| |/ / / | |||||
* | | | | Stream video recording. | Warwick Allison | 2009-05-05 | 2 | -61/+71 |
| | | | | |||||
* | | | | ffmpeg support | Warwick Allison | 2009-05-05 | 3 | -21/+80 |
|/ / / | | | | | | | | | | still image based for now, streaming next | ||||
* | | | Fix typo. | Michael Brasser | 2009-05-01 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Smith | 2009-04-30 | 3 | -34/+43 |
|\ \ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Support stdin | Warwick Allison | 2009-04-30 | 1 | -12/+14 |
| | | | | |||||
| * | | | Documentation work. | Michael Brasser | 2009-04-30 | 2 | -22/+29 |
| | | | | |||||
* | | | | qdoc: Corrected some qdoc warnings. | Martin Smith | 2009-04-30 | 1 | -1/+2 |
|/ / / |