summaryrefslogtreecommitdiffstats
path: root/tools/qml
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-274-16/+25
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (29 commits) Plugins documentation. Fix update issue when an item has an effect and child. Fix QDeclarativeTextInput and QGraphicsView in regards of input methods hints. Disallow "Qt" as namespace import Don't "adjust" the z value of a delegate that has been cached. Correctly inherit extension properties Autotests More QDeclarativeNetworkAccessManagerFactory doc clarification. Fix QDeclarativeNetworkAccessManagerFactory docs. Don't crash on invalid model remove signal. Ensure scheduled layout can occur before testing. Fix remaining 4.6 type registrations (to 4.7). doc anchor margins vs. anchor (line) state/animation. These examples should not be included in this test Unify naming of settings / UI to be "Qt Qml Runtime" Improved error messages for type resolving, new debug option Link to example files from tutorial pages Add tutorial for writing QML extensions no export in plugin Add doc pages for qml examples. ...
| * Fix remaining 4.6 type registrations (to 4.7).Warwick Allison2010-04-271-1/+1
| | | | | | | | | | | | Missed/cross-paths with a29627231a02ebf98645675acbd353618d1109d4. Task-number: QTBUG-10081
| * Unify naming of settings / UI to be "Qt Qml Runtime"Kai Koehne2010-04-263-6/+7
| | | | | | | | Reviewed-by: Henrik Hartz
| * Fix hidden menu on embedded.Warwick Allison2010-04-232-7/+17
| | | | | | | | Menu strangely still produces hits on embedded. Don't create it if frameless.
| * Location of binary is not on installed-content import path.Warwick Allison2010-04-231-2/+0
| | | | | | | | Reviewed-by: mae
* | Assigned a UID3 to qml.exe.Frans Englich2010-04-261-1/+1
|/ | | | Allocated in S60 Team's wiki over UID3s in Qt.
* Fix versioning of Qt Declarative's in-built typesAlan Alpert2010-04-213-7/+7
| | | | | | Since we aren't releasing for 4.6, all types are new in 4.7. Task-number: QTBUG-10081
* delete the viewer before calling exit(). Ensures correct cleanup.Martin Jones2010-04-211-26/+28
|
* Make logger widget thread safe.Martin Jones2010-04-213-4/+6
|
* Visual test fix.Michael Brasser2010-04-211-1/+2
|
* License headersAaron Kennedy2010-04-203-1/+83
|
* Show command line help / qml runtime output in GUIKai Koehne2010-04-205-11/+114
| | | | | | | | | Since qml is a GUI program, debugging output isn't visible by default for Windows/Mac users. Therefore provide command line help in a dialog (Windows), and runtime errors/warnings in a separate top level window. Done together with mae. Reviewed-by: mae
* Improve error messages, especially on embedded.Warwick Allison2010-04-201-1/+1
| | | | | | With embedded, it is often the case that some QT_NO_* features are turned off (eg. QT_NO_XMLPATTERNS), which in turn leads to QML types not being available.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Alan Alpert2010-04-191-1/+1
|\ | | | | | | | | | | Conflicts: doc/src/template/style/style.css tools/qdoc3/htmlgenerator.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-161-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (34 commits) Fix duplicate project entry in visual studio solution file. Doc qdoc: Added the index and fixed images in the extra files list. Speed up qsTr() by caching the translation context Crash while printing from the portedcanvas example on Mac Cocoa. qdoc: Fixed .qdocconf files for assistant. Disable debug-only framework builds on Mac. Compile (with -no-pch) Add missing QT_NO_BEARERMANAGEMENT ifdefs. Introduce a qconfig feature for Bearer Management Fix MOBILITY-404 Remove holes in bearer management data structures. Don't link bearer plugins against QtGui unnecessarily. Added missing newline after warning message when using -L with qml Doc: updating scripts Fixed a crash on embedded due to uninitialized pointer. Fix a race where QThread::exit() is "lost" when called after start() qdoc: Removed all <table> attributes in favor of using css. Autotest failure: dialogModality test fails on cocoa (macgui) Force the bic test to compile in 32-bit mode on Mac ...
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-151-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (24 commits) Fix MOBILITY-404 Remove holes in bearer management data structures. Don't link bearer plugins against QtGui unnecessarily. Added missing newline after warning message when using -L with qml Doc: updating scripts Fixed a crash on embedded due to uninitialized pointer. Fix a race where QThread::exit() is "lost" when called after start() qdoc: Removed all <table> attributes in favor of using css. Autotest failure: dialogModality test fails on cocoa (macgui) Force the bic test to compile in 32-bit mode on Mac Revert "Doc: Updating design files." Remove statically allocated pixmaps through the post routine qdoc: Checked for empty title. qdoc: Added TOC to class ref pages. Cocoa: qwidget autotest fails on setToolTip Compile on Mac OS 10.4 Bearer management changes from Qt Mobility (7a5ff985) Partially revert "Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors" Fix margins for placeholdertext in QLineEdit qdoc: Added TOC to module pages. ...
| | | * Added missing newline after warning message when using -L with qmlThorbjørn Lindeijer2010-04-141-1/+1
| | | |
* | | | ResizeMode support for QGraphicsWidgets created with QDeclarativeViewJoona Petrell2010-04-163-44/+81
|/ / / | | | | | | | | | | | | Task-number: QTBUG-8814 Reviewed-by: alexis
* | | Update examples autotest to use the runtime directlyAaron Kennedy2010-04-152-17/+16
| | | | | | | | | | | | This improves the test execution time
* | | Visual test updates.Michael Brasser2010-04-151-0/+18
| | |
* | | Remove dead wgt support from qml runtimeAaron Kennedy2010-04-144-136/+44
|/ /
* | Merged 'orientation' into 'runtime' context property in qmlruntimeLeonardo Sobral Cunha2010-04-142-31/+15
| | | | | | | | | | | | | | | | | | | | | | Removed the 'Screen' element from DeclarativeViewer, as it was used only for the orientation property. Now access the 'orientation' property like this: 'runtime.orientation' and the enum is accessed as 'Orientation.Landscape', when using the qmlruntime. Updated docs for qmlruntime. Reviewed-by: Martin Jones
* | Add 'runtime' property to the rootContext of DeclarativeViewerLeonardo Sobral Cunha2010-04-142-0/+45
| | | | | | | | | | | | | | | | | | | | The 'runtime' property is a singleton object that contains various info about the execution environment for the qml application. Currently it contains just one property 'isActiveWindow', which tells if the window of the declarative viewer is active or not. Task-number: QTBUG-8902 Reviewed-by: Martin Jones
* | Reduce QML runtime capabilities to NetworkServices and ReadUserDataJoona Petrell2010-04-141-1/+1
| | | | | | | | | | Task-number: Reviewed-by: Martin Jones
* | Support recording visual snapshot tests.Michael Brasser2010-04-143-3/+15
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-131-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix qmake.pro after Symbian alternate build system integration Fix compile error Don't try to use so much permissions, use something a lot more sane A bit saner suggestion Remove not needed permissions Make compile on Symbian
| * Make compile on SymbianThomas Zander2010-04-121-1/+1
| |
* | WarningAaron Kennedy2010-04-121-1/+1
| |
* | Read Maemo orientation at startupAaron Kennedy2010-04-121-8/+5
| | | | | | | | QT-2695
* | Add Mac OS X bundle description for qml runtimeKai Koehne2010-04-092-0/+20
| | | | | | | | | | | | Also, it's now Qml.app instead of qml.app. An icon is still missing. Reviewed-by: con
* | Replace "property var " with "property variant " in QML codeAaron Kennedy2010-04-091-2/+2
| |
* | Tune plugin import mechanismmae2010-04-083-5/+36
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | In shadow build environments, we cannot enforce that shared library objects for plugins are located in the same directory as the qmldir file. This makes it hard for Creator to support mixed projects (qml/c++). In order to gain more flexibility, the patch introduces a pluginPathList to QDeclarativeEngine, which completes the existing importsPathList. The pluginPathList defaults to ["."], which indicates the directory where the qmldir file is located in. The qml viewer tool gains a command line option -P to add to the pluginPathList. For consistency, the -L option ("Library") has been renamed to -I ("Import"). QDeclarativeEngine::importExtension() has been renamed to QDeclarativeEngine::importPlugin(). The documentation has been adjusted accordingly. Done with erikv. Reviewed-by: erikv
* Minor cleanup for visual test framework.Michael Brasser2010-03-315-11/+11
|
* Fix viewer resizing on reload and File->openMartin Jones2010-03-301-17/+16
| | | | Task-number: QTBUG-9325
* Simplify import path.Warwick Allison2010-03-291-2/+9
| | | | Reviewed-by: mae
* Deprecate inline Script {} blocksAaron Kennedy2010-03-221-30/+28
| | | | | | | | Inline blocks/includes have been replaced with an import syntax: import "foo.js" as Foo this gives better separation between QML and code. Imported script blocks also have a mandatory qualifier, which leads to better optimization potential.
* Remove dead performance measurement code from QMLAaron Kennedy2010-03-221-5/+0
|
* Don't destroy cookie jar until while someone may be using it.Martin Jones2010-03-181-24/+34
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Alan Alpert2010-03-171-1/+1
|\ | | | | | | | | | | | | Conflicts: configure.exe src/declarative/util/qdeclarativelistmodel.cpp tools/qml/qml.pro
| * Fix SetDialogPreference build error on Symbian.Morten Johan Sørvig2010-03-121-1/+1
| | | | | | | | | | Similar to 032d4ac63687d209ffef594bf6ef60e3db20bfa3.
| * Fixed the QML browser built into the QML viewerThorbjørn Lindeijer2010-03-101-5/+5
| | | | | | | | Was still using 'matchProperties' instead of just 'properties'.
* | Enable GL samplebuffers by default on Mac OS XAaron Kennedy2010-03-121-0/+5
| |
* | Document - and use - the qmlRegisterXXX template functionsmae2010-03-103-6/+6
| | | | | | | | This commit removes the obsolete QML_REGISTER_TYPE macros.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-101-5/+5
|\ \
| * | update Browser.qml to run againAlan Alpert2010-03-091-5/+5
| |/
* | Link with the correct library for TCommDbConnPrefMartin Jones2010-03-101-1/+1
|/
* Let the 'qml' runtime use its applicationDirPath as importsPathmae2010-03-021-0/+3
| | | | | | The is analog to the plugin system in Qt. It makes it possible to ship an executable with extra plugins resp. qml import modules without creating a qt.conf.
* Merge branch 'master' into 4.7Aaron Kennedy2010-03-021-2/+2
|\
| * Make "on" syntax mandatory for value sources and interceptorsAaron Kennedy2010-03-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Where you would have written x: NumberAnimation {} y: Behavior {} you now must write NumberAnimation on x {} Behavior on y {} This change also makes the parser more strict with respect to multiple assignments to a single property - they're no longer allowed. For example this x: 10 x: 11 is now an error.
* | build fix for WinCEMaurice Kalinowski2010-03-011-1/+3
|/ | | | | | only use xmlpatterns if Qt is configured to build it Reviewed-by: Paul Olav Tvete