summaryrefslogtreecommitdiffstats
path: root/tools/qml/main.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Update contact information in license headers.Sergio Ahumada2012-08-011-2/+2
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Introduced a CONFIG option that enables declarative debug servicesThorbjørn Lindeijer2011-05-041-3/+0
| | | | | | | | | | | This replaces the need for applications to explicitly make a call to enable the debug services, and rather does it in declarative.h when the 'declarative_debug' CONFIG option is used. Done-with: Kai Koehne Change-Id: I817f22a4ec9226a1ee2d080c1f5bb75d8599a06e Reviewed-by: Martin Jones Reviewed-by: Michael Brasser
* QmlViewer: Translate UIKai Koehne2011-05-021-39/+52
| | | | | | | | | Install translators for the Qt & QmlViewer translations. also add QT_NO_CAST_FROM_ASCII, QT_NO_CAST_TO_ASCII to check for untranslated strings. Reviewed-by: Oswald Buddenhagen Task-number: QTBUG-14848
* Merge branch 'master' of ../qt-qml-stagingMichael Brasser2011-04-141-0/+3
|\
| * QmlViewer: Enable remote qml debuggingKai Koehne2011-04-061-0/+3
| | | | | | | | | | | | | | | | Allow users to use qmlviewer for profiling. Change-Id: I4bddabceade17260159ff5b46b35072afb204ff6 Task-number: QTBUG-18595 Reviewed-by: Christiaan Janssen
* | Merge branch 'master' of ../qt-qml-stagingMartin Jones2011-02-171-33/+24
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-191-1/+1
| |\
| * | Add a warning when translating QML application in qmlviewer failsJoona Petrell2011-01-171-2/+5
| | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| * | Provide qmlviewer warning window also on SymbianJoona Petrell2010-12-311-30/+19
| | | | | | | | | | | | | | | Task-number: QTBUG-10800 Reviewed-by: Christopher Ham
| * | Forward qmlviewer traces to system's default message handler on SymbianJoona Petrell2010-12-301-4/+3
| | | | | | | | | | | | | | | Task-number: QTBUG-16353 Reviewed-by: Christopher Ham
* | | Make -no-opengl exist on other platformsAlan Alpert2011-02-041-3/+2
| |/ |/| | | | | Task-Number: QTBUG-15830
* | Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
|/ | | | Reviewed-by: Trust Me
* Build on SymbianMartin Jones2010-12-121-13/+13
| | | | Reviewed-by: Michael Brasser
* QmlViewer: Fix crash on exitKai Koehne2010-12-101-21/+21
| | | | | | | | | | | We can't use atexit() handler to show a warning, since whether the QApplication object then still exists or not is undefined. Instead, call the method directly where it makes sense (warnings about command line arguments etc). Task-number: QTBUG-15740 Reviewed-by: Thomas Hartmann
* Allow testing of raster engine on Mac from qmlviewerAaron Kennedy2010-11-191-0/+9
|
* Add 'skip' property that QML visual tests can useAlan Alpert2010-10-291-0/+3
| | | | | | | | | | This property can be set with a reason to skip the test (i.e. known bug) and the failure will not count for blocking purposes. This change also alters one of the failing tests to use the new property Task-number: QTBUG-14792 Reviewed-by: Michael Brasser
* 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
* Fix recording of QML visual tests when using a QGLWidget viewport.Michael Brasser2010-09-061-2/+1
| | | | | In order for the event filter to work, we need to set the QGLWidget as the viewport before constructing the QDeclarativeTester.
* Improve utility of QMLViewerAaron Kennedy2010-07-291-177/+299
| | | | | | | Adds a startup animation for all platforms, and adds support for file associated and drag and drop on Mac OS X QTBUG-12496
* Only support portrait and landscape orientations on Symbian when updating ↵Joona Petrell2010-07-131-9/+2
| | | | | | | the runtime.orientation property Task-number: QTBUG-12036 Reviewed-by: Martin Jones
* Add Symbian support for runtime.orientation propertyJoona Petrell2010-07-071-0/+11
| | | | | Task-number: Reviewed-by: Martin Jones
* Prevent a recursive debug output loop when writing to the logger widget.Robert Griebl2010-07-061-4/+11
| | | | | | | (On Maemo5 the input method may generate a qWarning when someone clicks into the logger widget, which leads to an endless output recursion) Reviewed-by: Harald Fernengel
* Don't write to the logger widget while the application is closing down.Robert Griebl2010-07-021-1/+1
| | | | Reviewed-by: TrustMe
* Indicate default sizing option in qmlviewerBea Lam2010-06-301-1/+1
|
* Micro cleanupHarald Fernengel2010-06-161-4/+3
| | | | | | Use Qt::WA_DeleteOnClose to clean up the top-level window Reviewed-by: Alan Alpert
* Rename qml executable to qmlviewerKai Koehne2010-05-191-2/+2
| | | | | Revert the name of the 'qml' executable back to qmlviewer (QMLViewer on mac).
* Renaming "Qml Launcher" back to "QML Viewer"Kai Koehne2010-05-181-7/+7
| | | | | | | | | Change the official name of the qml executable back to "Qt QML Viewer" - the original name before it got renamed to "QML Runtime" and then "QML Launcher". Also, the new Mac OS X bundle name is "QMLViewer" (without a space to ease command line use).
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-181-1/+5
|\
| * Set raster + gl viewport as the default for OS X.Michael Brasser2010-05-181-1/+5
| | | | | | | | | | | | This setup seems to work around most rendering bugs and timing issues. Task-number: QTBUG-10544
* | Move stuff from QML viewer to plugins.Warwick Allison2010-05-171-2/+0
|/
* Rename QML Runtime (executable) to QML LauncherKai Koehne2010-05-141-7/+7
| | | | | | | | The qml executable was first referred to as QML Viewer, then QML Runtime ... however, the latter one caused much confusion (see old version of qmlruntime.qdoc). Doc changes reviewed by Leena Miettinen.
* Remove skins from qml launcher.Kai Koehne2010-05-141-21/+0
|
* Revert "Use raster graphicssystem for qml.app on OS X."Michael Brasser2010-05-141-1/+1
| | | | This reverts commit d412a77d1e9a1c6810e10dfa4a0a35a81391cf29.
* Use raster graphicssystem for qml.app on OS X.Michael Brasser2010-05-121-1/+1
| | | | Task-number: QTBUG-10544
* Temporary work-around for QTBUG-9849.Warwick Allison2010-05-111-0/+6
| | | | May allow better experimentation and bug fixing.
* Another initialization fix. Unleak.Warwick Allison2010-05-051-1/+1
|
* Add a switch to the menu to hide/show the runtime warningsKai Koehne2010-05-051-10/+23
| | | | Reviewed-by: mae
* Don't show warnings log window by defaultKai Koehne2010-04-291-4/+5
| | | | | | | Disable it for the time being. The default annoyed more people then it helped. Reviewed-by: mae
* Unify naming of settings / UI to be "Qt Qml Runtime"Kai Koehne2010-04-261-2/+2
| | | | Reviewed-by: Henrik Hartz
* Location of binary is not on installed-content import path.Warwick Allison2010-04-231-2/+0
| | | | Reviewed-by: mae
* delete the viewer before calling exit(). Ensures correct cleanup.Martin Jones2010-04-211-26/+28
|
* Make logger widget thread safe.Martin Jones2010-04-211-1/+2
|
* License headersAaron Kennedy2010-04-201-1/+1
|
* Show command line help / qml runtime output in GUIKai Koehne2010-04-201-7/+60
| | | | | | | | | 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
* 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-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
| | |