summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-0823-426/+637
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-0724-427/+638
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (26 commits) Live texture updates to meegographicssystem helper. Live texture updates to meegographicssystem plugin. Revert the integration of the merge request 2286. Fix text rendering in GL when using the broken-fbo-fallback ActiveQt: also make the designer plugin for qaxwidget build in the opensource versions Fix compilation Code cleaning with the merge request 2286 Fix a pending issue with the merge request 2286 Doc: fix description of the expected behavior for QGraphicsItem::cursor Fixed the build error in qtconfig Resolved a little code style issue in qtconfig Renamed controls in qtconfig's MainWindow Removed inheritance from UI file in qtconfig's MainWindow Fixed a bug and resolved some translation issues in qtconfig Fixed some problems in qtconfig's PreviewWidget Removed the inheritance from ui file in qtconfig's PaletteEditorAdvanced Replaced the unnecessary include with declaration Resolved some code style issues and fixed the broken copyright year Finally removed the qtconfig dependency from qt3support Modified previewwidget's ui file in qtconfig ...
| | * Live texture updates to meegographicssystem helper.Michael Dominic K2010-10-0711-406/+197
| | | | | | | | | | | | | | | Merge-request: 848 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * Live texture updates to meegographicssystem plugin.Michael Dominic K2010-10-077-0/+303
| | | | | | | | | | | | | | | Merge-request: 848 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * Revert the integration of the merge request 2286.Benjamin Poulain2010-10-0723-1496/+2798
| | | | | | | | | | | | | | | | | | | | | The merge request 2286 will be integrated in master. This should let an angry developer calm down and resume his work.
| | * Fix text rendering in GL when using the broken-fbo-fallbackEskil Abrahamsen Blomfeldt2010-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a backport of 3874cd95e203da40d5205ef6455d7f56cba6923a which was committed to qt:master. Since the patch that originally exposed the bug was added to 4.7.2, this patch is required there as well. Bug is visible when resizing the glyph cache on devices where QGLContext::brokenFBOReadback defaults to true, or by setting this to true on desktop. Reviewed-by: Gunnar
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-0727-2817/+1632
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (22 commits) ActiveQt: also make the designer plugin for qaxwidget build in the opensource versions Fix compilation Code cleaning with the merge request 2286 Fix a pending issue with the merge request 2286 Doc: fix description of the expected behavior for QGraphicsItem::cursor Fixed the build error in qtconfig Resolved a little code style issue in qtconfig Renamed controls in qtconfig's MainWindow Removed inheritance from UI file in qtconfig's MainWindow Fixed a bug and resolved some translation issues in qtconfig Fixed some problems in qtconfig's PreviewWidget Removed the inheritance from ui file in qtconfig's PaletteEditorAdvanced Replaced the unnecessary include with declaration Resolved some code style issues and fixed the broken copyright year Finally removed the qtconfig dependency from qt3support Modified previewwidget's ui file in qtconfig Fixed some code style issues in qtconfig Refactored the MainWindow in qtconfig Refactored PaletteEditorAdvanced in qtconfig Removed more legacy code from qtconfig and fixed codestyle issues ...
| | | * ActiveQt: also make the designer plugin for qaxwidget build in the ↵Patrick Spendrin2010-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | opensource versions Reviewed-by: Olivier Goffart Merge-Request: 843
| | | * Fix compilationOlivier Goffart2010-10-074-8/+9
| | | | | | | | | | | | | | | | after merge request 2286
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Benjamin Poulain2010-10-063-19/+135
| | | |\
| | | | * Doc: fix description of the expected behavior for QGraphicsItem::cursorPierre Rossi2010-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was fixed for setCursor in 600ff0193c9bfac4d2b40960766002e8b81aca22. Reviewed-by: Alexis
| | | | * QGraphicsItem device coordinate cache unefficient in portrait modeBjørn Erik Nilsen2010-10-062-18/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem was that we always invalidated the cache whenever the item was rotated. This is however not required for simple rotations such as 90, 180 and 270 degrees. This commit also removes the somewhat arbitrary logic which takes the desktop size into account. We now use the viewport size instead. Auto test included. Task-number: QT-3779 Reviewed-by: yoann
| | | * | Code cleaning with the merge request 2286Benjamin Poulain2010-10-065-17/+15
| | | | | | | | | | | | | | | | | | | | | | | | | The merge request 2286 changes a lot of the QtConfig tool. I took this opportunity to clean some old style mistake.
| | | * | Fix a pending issue with the merge request 2286Benjamin Poulain2010-10-061-6/+1
| | | | | | | | | | | | | | | | | | | | A merge conflict was forgoten in the last update. This patch fixes that.
| | | * | Fixed the build error in qtconfigBoris Moiseev2010-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtconfig failed to build with Phonon gstreamer backend turned on Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | | * | Resolved a little code style issue in qtconfigBoris Moiseev2010-10-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | | * | Renamed controls in qtconfig's MainWindowBoris Moiseev2010-10-062-346/+357
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All the controls are ensured to be named according to a Qt Coding Style. The code is much more readable now. Also, the html code inserts and tab stops in UI was fixed. Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | | * | Removed inheritance from UI file in qtconfig's MainWindowBoris2010-10-062-245/+269
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | | * | Fixed a bug and resolved some translation issues in qtconfigBoris Moiseev2010-10-061-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | | * | Fixed some problems in qtconfig's PreviewWidgetBoris Moiseev2010-10-063-33/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One problem was introduced by the convertion of widget from Qt3: there is no such field as "text" in QTextEdit. Also, widget now is not direct ancestor of UI file. Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | | * | Removed the inheritance from ui file in qtconfig's PaletteEditorAdvancedBoris Moiseev2010-10-062-38/+45
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | | * | Replaced the unnecessary include with declarationBoris Moiseev2010-10-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | | * | Resolved some code style issues and fixed the broken copyright yearBoris Moiseev2010-10-065-39/+40
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | | * | Finally removed the qtconfig dependency from qt3supportBoris Moiseev2010-10-062-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | | * | Modified previewwidget's ui file in qtconfigBoris Moiseev2010-10-061-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The modification is needed to prevent ui compilation time warnings. Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | | * | Fixed some code style issues in qtconfigBoris Moiseev2010-10-061-26/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | | * | Refactored the MainWindow in qtconfigBoris Moiseev2010-10-067-696/+235
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtconfig can now be fully build without qt3support module. Removed some legacy and unused code, changed one of labels on widget to reflect the real meaning of configuration parameter. Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | | * | Refactored PaletteEditorAdvanced in qtconfigBoris Moiseev2010-10-068-1244/+623
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The widget was redrawn and now makes use of QDialogButtonBox. The ColorButton's are created more correctly for now. Also, all of the Qt4 ColorRoles are now supported. All the legacy code was dropped so it must not depend of qt3support. Some refactoring job also was done and much of unused code was removed. Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | | * | Removed more legacy code from qtconfig and fixed codestyle issuesBoris Moiseev2010-10-064-18/+17
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | | * | Refactored PreviewWidget in qtconfigBoris Moiseev2010-10-068-513/+285
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the legacy code and behavior. Now this part of qtconfig doesn't need the qt3support module to be built. Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-10-0743-69/+525
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Fix the icd auto config test after restructuring the icd plugin dependencies Ensure that actions are still fired even if there is no visible window Support device orientation in harmattan Connect property alias change signals on use Doc fix. Fix setting PathView offset when all visible items are removed. Rename toolbar button. Update import statement. Fixes assert in QDeclarativeWebView Do not show 'More' button when in fullscreen view. Set reasonable QT_GUI_DRAG_DISTANCE in mkspecs/linux-g++-maemo/qplatformdefs.h Allow default QApplication::startDragDistance() to be defined in platformdefs.h Autotest Ensure the TextInput cursor blinks immediately when enabled. Fix minehunt execution from QtDemo Update QtGui def files Ensure PathView updates positions when path changes. Create Loader components in correct context
| * \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-073-3/+14
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-073-3/+14
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix the icd auto config test after restructuring the icd plugin dependencies Ensure that actions are still fired even if there is no visible window
| | | * | | Fix the icd auto config test after restructuring the icd plugin dependenciesAdrian Constantin2010-10-072-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove the auto config tests related to libicd-network-wlan-dev * Add test for the icd backend * Add test for connsettings See also f532d8fcd236be9933e4186a95561e1c264de277. Reviewed-by: Aaron McCarthy
| | | * | | Ensure that actions are still fired even if there is no visible windowAndy Shaw2010-10-071-0/+5
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mac, if there is no visible window then actions can still be fired from the menubar as the menubar can still be accessed and used. This ensures that the actions are still triggered in this circumstance. Task-number: QTBUG-13941 Reviewed-by: Richard Moe Gustavsen
| * | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-0740-66/+511
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0740-66/+511
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Support device orientation in harmattan Connect property alias change signals on use Doc fix. Fix setting PathView offset when all visible items are removed. Rename toolbar button. Update import statement. Fixes assert in QDeclarativeWebView Do not show 'More' button when in fullscreen view. Set reasonable QT_GUI_DRAG_DISTANCE in mkspecs/linux-g++-maemo/qplatformdefs.h Allow default QApplication::startDragDistance() to be defined in platformdefs.h Autotest Ensure the TextInput cursor blinks immediately when enabled. Fix minehunt execution from QtDemo Update QtGui def files Ensure PathView updates positions when path changes. Create Loader components in correct context
| | | * | | Support device orientation in harmattanMartin Jones2010-10-072-0/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14137 Reviewed-by: Aaron Kennedy
| | | * | | Connect property alias change signals on useAaron Kennedy2010-10-0714-43/+147
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14089
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0725-24/+199
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Doc fix. Fix setting PathView offset when all visible items are removed. Rename toolbar button. Update import statement. Fixes assert in QDeclarativeWebView Do not show 'More' button when in fullscreen view. Set reasonable QT_GUI_DRAG_DISTANCE in mkspecs/linux-g++-maemo/qplatformdefs.h Allow default QApplication::startDragDistance() to be defined in platformdefs.h Autotest Ensure the TextInput cursor blinks immediately when enabled. Fix minehunt execution from QtDemo Update QtGui def files Ensure PathView updates positions when path changes. Create Loader components in correct context
| | | | * | | Doc fix.Michael Brasser2010-10-071-3/+3
| | | | | | |
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-077-15/+26
| | | | |\ \ \
| | | | | * | | Rename toolbar button.Yann Bodson2010-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-3637
| | | | | * | | Update import statement.Michael Brasser2010-10-061-1/+1
| | | | | | | |
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0623-19/+183
| | | | | |\ \ \ | | | | | | |_|/ | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fixes assert in QDeclarativeWebView Do not show 'More' button when in fullscreen view. Set reasonable QT_GUI_DRAG_DISTANCE in mkspecs/linux-g++-maemo/qplatformdefs.h Allow default QApplication::startDragDistance() to be defined in platformdefs.h Autotest Ensure the TextInput cursor blinks immediately when enabled. Fix minehunt execution from QtDemo Update QtGui def files Ensure PathView updates positions when path changes. Create Loader components in correct context
| | | | | | * | Fixes assert in QDeclarativeWebViewThomas Hartmann2010-10-061-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If QDeclarativeWebView was instantiated twice an assert was triggered by QWebSettings::enablePersistentStorage(); This patch is crtical for tooling (Bauhaus) Task-number: QTBUG-14278 Reviewed-by: Aaron Kennedy
| | | | | | * | Do not show 'More' button when in fullscreen view.Yann Bodson2010-10-062-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11813
| | | | * | | | Fix setting PathView offset when all visible items are removed.Martin Jones2010-10-072-1/+12
| | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we remove all items then we don't have a valid firstIndex with which to anchor item positions, so just use offset. Task-number: QTBUG-14199 Reviewed-by: Michael Brasser
| | | | * | | Set reasonable QT_GUI_DRAG_DISTANCE in mkspecs/linux-g++-maemo/qplatformdefs.hMartin Jones2010-10-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-3930
| | | | * | | Allow default QApplication::startDragDistance() to be defined in platformdefs.hMartin Jones2010-10-061-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-3930 Reviewed-by: Joona Petrell
generated by cgit v0.12 at 2024-11-22 19:48:47 (GMT)