summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-07-023-26/+30
|\
| * Doc: Adding navigation and style fixes. Also rearranging qml elementsMorten Engvoldsen2010-07-012-25/+26
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-012-1/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QSslSocket::systemCaCertificates(): have one common case for all Unices Fixed QX11EmbedContainer. Improved a bit detection of a touch screen on Windows. qdoc: Fixed invalid format in the html header. link glu32 before opengl32 Stopped trying to output QML property list in 2 columns
| | * qdoc: Fixed invalid format in the html header.Martin Smith2010-07-011-1/+1
| | | | | | | | | | | | Task-number: QTBUG-11803
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-011-596/+596
| | |\
| | * | Stopped trying to output QML property list in 2 columnsMartin Smith2010-06-301-0/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-11009, QTBUG-11096
| * | | Removed compilation warning for systems with no OpenGL supportLasse Holmstedt2010-07-011-0/+2
| | | | | | | | | | | | | | | | Reviewed-by: Aaron Kennedy
* | | | qmlviewer: Update the proxy factory when the user changes the proxy.Martin Jones2010-07-021-42/+62
|/ / / | | | | | | | | | Task-number: QTBUG-11856
* | | Remove qmlviewer dependency on QDeclarativeTimerMartin Jones2010-07-013-21/+23
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-0115-228/+970
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (62 commits) Don't access uninitialized value. Added SET_BINDING message to QDeclarative debugger protocol Add ListView.nextSection attached property Remove the old font.outline documentation Docs - add more links to relevant examples Rewrite runtime & qmlviewer docs and emphasise that qmlviewer shouldn't Indicate default sizing option in qmlviewer Plug QdeclarativePixmapCache canceled request leak. update qml.qch to version 4.7 Undefined is undefined, and now qml warns about it Fix so window will resize with the root object (broken by Avoid duplicate code for testing initial sizes Remove an unnecessary connect() in TextInput Ensure micro focus is updated in TextEdit and TextInput Fix flow layout not taking into account whether it's width and height are implicit or not. Avoid binding loop. Ensure Loader item change listener is removed when Loader is destroyed Adapt all qmlviewer testcases to the code changes in the actual viewer. Stop QMLLauncher from crashing on exit on Mac when quitting app via the VisualDataModel hasModelChildren role shadowed user roles. ...
| * | Indicate default sizing option in qmlviewerBea Lam2010-06-301-1/+1
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2914-227/+969
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (54 commits) update qml.qch to version 4.7 Undefined is undefined, and now qml warns about it Fix so window will resize with the root object (broken by Avoid duplicate code for testing initial sizes Remove an unnecessary connect() in TextInput Ensure micro focus is updated in TextEdit and TextInput Fix flow layout not taking into account whether it's width and height are implicit or not. Avoid binding loop. Ensure Loader item change listener is removed when Loader is destroyed Adapt all qmlviewer testcases to the code changes in the actual viewer. Stop QMLLauncher from crashing on exit on Mac when quitting app via the VisualDataModel hasModelChildren role shadowed user roles. Allow positioning of ListView items width sub-pixel precision. Examples clean up Docs Improve appearance when scaling Tweak Qt Demo Behaviour forget to rename the moc include when renaming deviceorientation_maemo.cpp fix namespace macros fix QML Viewer resize modes ...
| | * update qml.qch to version 4.7mae2010-06-291-2/+2
| | | | | | | | | | | | | | | | | | | | | This fixes a version clash when both qt.qch and qml.qch are loaded into Qt Creator Done-with: Daniel Molkentin
| | * Fix so window will resize with the root object (broken byBea Lam2010-06-291-0/+1
| | | | | | | | | | | | 156cabe79a64ffca8d6e1a2df99f35b413a48a39)
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2913-225/+966
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (46 commits) Ensure Loader item change listener is removed when Loader is destroyed Adapt all qmlviewer testcases to the code changes in the actual viewer. Stop QMLLauncher from crashing on exit on Mac when quitting app via the VisualDataModel hasModelChildren role shadowed user roles. Allow positioning of ListView items width sub-pixel precision. Examples clean up Docs Improve appearance when scaling Tweak Qt Demo Behaviour forget to rename the moc include when renaming deviceorientation_maemo.cpp fix namespace macros fix QML Viewer resize modes forgot to cleanup the code a bit after adding Maemo5 support Make the QML viewer usable on the N900 Test QTBUG-11222 Test ListElement type via type system, not string comparison. Test only on X11, not only on Linux (which includes embedded). Handle enums in method arguments in the same way as QtScript Allow custom parsers to handle attached properties Allow components to be created from .pragma library JS files ...
| | | * Adapt all qmlviewer testcases to the code changes in the actual viewer.Robert Griebl2010-06-283-15/+4
| | | | | | | | | | | | | | | | (currently tested on Linux only)
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2814-225/+977
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (44 commits) Stop QMLLauncher from crashing on exit on Mac when quitting app via the VisualDataModel hasModelChildren role shadowed user roles. Allow positioning of ListView items width sub-pixel precision. Examples clean up Docs Improve appearance when scaling Tweak Qt Demo Behaviour forget to rename the moc include when renaming deviceorientation_maemo.cpp fix namespace macros fix QML Viewer resize modes forgot to cleanup the code a bit after adding Maemo5 support Make the QML viewer usable on the N900 Test QTBUG-11222 Test ListElement type via type system, not string comparison. Test only on X11, not only on Linux (which includes embedded). Handle enums in method arguments in the same way as QtScript Allow custom parsers to handle attached properties Allow components to be created from .pragma library JS files Fix assert Disallow global object properties as property names ...
| | | | * Stop QMLLauncher from crashing on exit on Mac when quitting app via theBea Lam2010-06-282-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | menu. This sets the QGraphicsView::viewport() to 0 on exit to avoid "QGLContext::makeCurrent: Cannot make invalid context current" errors on exit, and deletes the logger window on exit so it does not receive error messages after the app is closed. The QGLContext errors appeared after 6d4e14ef0437ce8f73bddbcb267cf5ef708fbdec.
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-06-288-86/+287
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativeglobalscriptclass.cpp
| | | | * | forget to rename the moc include when renaming deviceorientation_maemo.cppRobert Griebl2010-06-251-1/+1
| | | | | |
| | | | * | fix namespace macrosRobert Griebl2010-06-251-1/+3
| | | | | |
| | | | * | fix QML Viewer resize modesRobert Griebl2010-06-252-5/+8
| | | | | |
| | | | * | forgot to cleanup the code a bit after adding Maemo5 supportRobert Griebl2010-06-253-19/+10
| | | | | |
| | | | * | Make the QML viewer usable on the N900Robert Griebl2010-06-2513-199/+909
| | | | | |
| | | | * | Make compile.Michael Brasser2010-06-241-1/+1
| | | | | |
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-241-26/+58
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update lupdate to recognize concatenated text in QML files. Ensure sourcesize is in pixmap cache key. Use ugly but reliable bitmaps fonts in test. doc: note that calling methods before component completion may have no effect Fix unstable qdeclarativeviewer tests Use Pen with Qt::MiterJoin when drawing Rectangles with gradients Update screenshot Fix and better test Text / TextEdit alignments. Ensure the view is correctly positioned at component complete. Support for non-literal plural arguments to qsTr() in lupdate (QML). References to undefined variables throws a ReferenceError
| | | | | * | Update lupdate to recognize concatenated text in QML files.Michael Brasser2010-06-241-16/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes a potential crash with non-string-literal nodes. Task-number: QTBUG-11580
| | | | | * | Support for non-literal plural arguments to qsTr() in lupdate (QML).Michael Brasser2010-06-231-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11579
* | | | | | | Reformat whitespace according to coding styleMark Brand2010-06-301-596/+596
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly indentation affected, but also standardized spaces adjacent to () in configureapp.cpp. Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | | | warn about stray meta dataOswald Buddenhagen2010-06-291-4/+7
| | | | | |
* | | | | | don't complain multiple times about same abuse of //% meta stringsOswald Buddenhagen2010-06-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kent Hansen Task-number: QTBUG-11818
* | | | | | fix double percent sign after migration to yyMsg()Oswald Buddenhagen2010-06-291-2/+2
|/ / / / /
* | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-289-77/+131
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-2812-88/+306
| |\ \ \ \ \ | | |/ / / /
| * | | | | Merge branch '4.7' of /home/dboddie/git/oslo-staging-1 into 4.7David Boddie2010-06-2523-373/+563
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-236-20/+173
| | |\ \ \ \ \
| | * | | | | | Doc: Fixed whitespace issues and added missing files to lists.David Boddie2010-06-233-67/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/dboddies-oslo-staging-1-qdoc ↵David Boddie2010-06-187-88/+313
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7
| * | | | | | | | qdoc: Added a workaround for QML/Qt class name clashes.David Boddie2010-06-186-10/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-282-16/+97
| |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added cxxDefine for macros. Task-number: QTBUG-11391
* | | | | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-281-0/+8
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added cxxVariableStorageClassSpecifierStatic. Task-number: QTBUG-11391
* | | | | | | Fixed copy-paste error in htmlgenerator.cppRohan McGovern2010-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: htmlgenerator.cpp:1893: error: stray ‘\’ in program
* | | | | | | Doc: fixing search bugMorten Engvoldsen2010-06-252-3/+15
| | | | | | |
* | | | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-252-8/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Output the \variable stuff as a cxxVariable. Task-number: QTBUG-11391
* | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-255-2/+16
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | We need to swallow the event, otherwise it might pop up several times.kh12010-06-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: kh
| * | | | | | Set the item data thru the model, so we actually emit dataChanged.kh12010-06-233-2/+10
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10629 Reviewed-by: kh
| * | | | | Removed support for static linking of QtWebKit.Simon Hausmann2010-06-231-0/+5
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Static linking of WebKit is not going to be supported anymore in Qt 4.7, so this commit makes sure it's mentioned in the documentation and that configure disables WebKit if static linking of Qt is requested. Reviewed-by: Andy Shaw <qt-info@nokia.com>
* | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-255-76/+207
|/ / / / | | | | | | | | | | | | | | | | | | | | Output Q_PROPERTY as a cxxVariable. Task-number: QTBUG-11391
* | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-221-0/+4
|\ \ \ \
generated by cgit v0.12 at 2024-12-28 16:02:07 (GMT)