summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Correctly handle both 16bit and 32bit live pixmaps in meego graphics system.Michael Dominic K2010-10-133-7/+7
| | | | | Merge-request: 856 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Designer: Fix a crash when copying empty page-based containers.Friedemann Kleint2010-10-111-5/+12
| | | | | Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Task-number: QTBUG-14208
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-0713-407/+199
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * 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.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-0724-2798/+1497
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * 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 '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-072-0/+166
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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
* | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-015-4/+8
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-305-4/+8
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (27 commits) Revert "QDeclarativeDebugService: Add bc autotest" to get changes through staging. Doc clarification. Fallback to A8 text rendering on Mac when LCD smoothing is disabled Recreate Qt 4.7 branch QtDeclarative def files on top of changes made to Qt 4.7.1 Autotest that new "import Qt 4.7"s aren't added accidentally Document "import QtQuick 1.0" change Replace "import Qt 4.7" with "import QtQuick 1.0" Add test for Qt 4.7 module Replace all occurances of "Qt 4.7" with "QtQuick 1.0" Correct property type of PathAttribute::value in the docs. Register QtQuick 1.0 module. Remove unused AST node destructors. Fix crash when trying to append a null transform to QDeclarativeItem. Documentation. Documentation fix for Flickable (mark content properties as real, not int). QDeclarativeDebugClient: Fix gcc warning QmlDebugService: Check that there is a receiver before sending messages If a type is registered under several names, share the attached property object QmlViewer: Fix typo in comment QmlViewer: Fix assert on exit (Windows) ...
| | * Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-293-3/+3
| | | | | | | | | | | | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
| | * Register QtQuick 1.0 module.Aaron Kennedy2010-09-291-0/+1
| | | | | | | | | | | | | | | | | | | | | Qt 4.7 is still supported, but deprecated. Reviewed-by: Martin Jones Task-number: QTBUG-13799
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-281-1/+4
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: QDeclarativeDebugClient: Fix gcc warning QmlDebugService: Check that there is a receiver before sending messages If a type is registered under several names, share the attached property object QmlViewer: Fix typo in comment QmlViewer: Fix assert on exit (Windows) QDeclarativeDebugService: Add bc autotest Make QmlDebug protocol more robust Minimize parameter changes on glyph cache textures Only set maskTexture sampler uniform once Only repopulate the glyph cache when we know something could have changed Remove unnecessary attribute changes Invalidate QStaticText coord cache when texture size changes
| | | * QmlViewer: Fix typo in commentKai Koehne2010-09-281-1/+1
| | | |
| | | * QmlViewer: Fix assert on exit (Windows)Kai Koehne2010-09-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QApplication object in main() is already destroyed when showWarnings() is called. Create another instance in this case. (Note that the assert will only be triggered for debug builds, while qmlviewer is built in release mode by default). Task-number: QTBUG-14009 Reviewed-by: Thomas Hartmann
* | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-305-1/+11
|\ \ \ \ | |/ / /
| * | | Don't use translations for console tools under windowsVictor Ostashevsky2010-09-285-1/+11
| |/ / | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13619 Merge-request: 2486 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | Merge commit 'oslo-staging-1/4.7' into week39Morten Engvoldsen2010-09-271-7/+41
| |\ \ | | |/
* | | Merge branch '4.7' into newSearchMorten Engvoldsen2010-09-2811-65/+86
|\ \ \
| * | | Doc: fixing bugs in slim-fit styleMorten Engvoldsen2010-09-281-31/+0
| | | |
| * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-271-7/+41
| |\ \ \ | | |/ / | |/| / | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-241-7/+41
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Small fixes to Browser.qml More declarative autotests. Fix example.
| | | * Small fixes to Browser.qmlJoona Petrell2010-09-241-7/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - focus highlight should not be shown if user presses any physical key, only when up, down, left and right arrow keys are pressed - hybrid devices (touch + four-way rocker) showed two highlight at the same time after using rocker and pressing the screen with finger - touch highlight had gradient, focus highlight one didn't - the width of the focus highlight didn't update when listview changed size (for example after orientation change) Task-number: Reviewed-by: Martin Jones
| * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-248-11/+26
| |\ \ \ | | |/ /
| | * | Assistant: Don't register internal doc when using custom collection.Christian Kandeler2010-09-234-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is intended to keep the internal documentation out of the "custom help viewer" use case, where it does not belong. Reviewed-by: kh1
| | * | Assistant: Move comment to the right place.Christian Kandeler2010-09-231-5/+7
| | |/
| | * Designer: Minor BT issue: '-' button in Signal/Slot editor not updated.Friedemann Kleint2010-09-231-1/+1
| | | | | | | | | | | | Reviewed-by: Carlos Manuel Duclos Vergara <carlos.duclos@nokia.com>
| | * build configure.exe directly in source dirOswald Buddenhagen2010-09-231-1/+1
| | | | | | | | | | | | Reviewed-by: mariusSO
| | * fix build key generation for realOswald Buddenhagen2010-09-231-1/+1
| | | | | | | | | | | | | | | Reviewed-by: danimo Task-number: QTBUG-13795
| * | Added a condition to skip obsolete functions during the threadness check.Jerome Pasion2010-09-241-16/+19
| | | | | | | | | | | | | | | Reviewed-by: David Boddie Task:QTBUG-13786
generated by cgit v0.12 at 2024-12-29 06:39:01 (GMT)