summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Assistant: Handle forward/backward mouse buttons on press on Linux.ck2010-04-135-16/+58
| | | | | | | | | | Written-by: kh1 Reviewed-by: ck
* | qdoc: Fixed some TOC links.Martin Smith2010-04-131-1/+0
| |
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-138-30/+82
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-1328-95/+491
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (61 commits) Revert Merge Request 551. This introduces regressions to Qt. Fixed scroll area size calculation on Mac. Fix a race where QThread::exit() is "lost" when called after start() make a partial build of linguist in no-gui config make the code less of a trap fix build from top level Partially revert MR 543 changes to Linguist. Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too. Autotest: add some debugging, just in case there's something wrong Autotest: fix the fix for the rounding error. Fix compile error with QT_NO_LIBRARY in QtMultimedia the _setmode() prototype is different on win ce qdoc: Changed qdoc to output the new doc format. Doc: update 'developing on mac' fcntl.h doesn't seem to exist, either - contrary to an example on msdn Autotest: fix paths on the test server after update. Force the repaint during a window resize. fix compile on wince remove CONFIG += ordered again Assistant: Check namespace and virtual folder syntax of help projects. ...
| | * | make a partial build of linguist in no-gui configOswald Buddenhagen2010-04-122-2/+3
| | | |
| | * | make the code less of a trapOswald Buddenhagen2010-04-121-15/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | it's not very wise to use += first, and then to overwrite everything with =. use proper scoping instead. Reviewed-by: joerg
| | * | Partially revert MR 543 changes to Linguist.Thiago Macieira2010-04-122-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Whatever this is doing, it breaks the build on Windows CE/Mobile. This has stopped oslo-staging-1 from integrating for over a week now. Not reviewed. This patch is a blind attempt at fixing the issue.
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-127-15/+63
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (130 commits) Warning Read Maemo orientation at startup Exclude gestures from examples autotest Exclude proxywidgets from examples autotest Fix crash on QScriptProgram destruction doc fixes Start documenting coding conventions Adds missing qml file to qdeclarativeflipable autotest Revert "Better reporting of extension plugin loading errors." Doc Fix graphicswidget auto-test. Add Mac OS X bundle description for qml runtime Cleanup Disallow writes to read-only value type properties Allow undefined to be assigned to QVariant properties Add a Qt.isQtObject() method Fix crash in QML library imports Remove QT_VERSION checks in QML List properties aren't read-only Small doc fix. ...
| | * | 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
* | | | qdoc: Added new table of contents for non-class ref pagesMartin Smith2010-04-133-3/+76
| |_|/ |/| | | | | | | | This feature is not complete in this commit.
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-1228-95/+487
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (54 commits) Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too. Autotest: add some debugging, just in case there's something wrong Autotest: fix the fix for the rounding error. Fix compile error with QT_NO_LIBRARY in QtMultimedia the _setmode() prototype is different on win ce qdoc: Changed qdoc to output the new doc format. Doc: update 'developing on mac' fcntl.h doesn't seem to exist, either - contrary to an example on msdn Autotest: fix paths on the test server after update. Force the repaint during a window resize. fix compile on wince remove CONFIG += ordered again Assistant: Check namespace and virtual folder syntax of help projects. QtHelp: Fix auto tests. Fix a crash when unloading libQtCore Introduce a qconfig feature for QtDBus Fix build after MR 543 merged. Compile on 10.4. revert "Fix the Qt build on Mac OS X/Cocoa 64-bit" Remove expected failures after JavaScriptCore bug fix ...
| * | Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too.Thiago Macieira2010-04-101-0/+4
| | | | | | | | | | | | | | | | | | | | | Ossi is right: on WinCE, _setmode is different from regular Windows and the docs... Reviewed-by: ossi
| * | the _setmode() prototype is different on win ceOswald Buddenhagen2010-04-091-0/+4
| | | | | | | | | | | | | | | | | | ... both from windows and the wince doc ... Reviewed-by: joerg
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-094-11/+30
| |\ \
| | * | fcntl.h doesn't seem to exist, either - contrary to an example on msdnOswald Buddenhagen2010-04-091-2/+2
| | | |
| | * | fix compile on winceOswald Buddenhagen2010-04-091-2/+7
| | | | | | | | | | | | | | | | Reviewed-by: joerg
| | * | remove CONFIG += ordered againOswald Buddenhagen2010-04-091-1/+0
| | | |
| | * | Assistant: Check namespace and virtual folder syntax of help projects.ck2010-04-081-6/+22
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4519 Reviewed-by: kh1
| | * | Fix build after MR 543 merged.Thiago Macieira2010-04-081-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | qmlviewer is now called simply qml, and the debugger is not in Qt sources anymore. Reviewed-by: Bradley T. Hughes
| * | | qdoc: Changed qdoc to output the new doc format.Martin Smith2010-04-0919-45/+351
| |/ / | | | | | | | | | Very cool.
| * | Allow building Qt without the QtGui moduleBernhard Rosenkraenzer2010-04-073-20/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a -no-gui switch to configure, allowing to build Qt without QtGui and components depending on QtGui. This is useful on headless servers, and in using QtCore, QtNetwork, QtXml, QtSql etc. on platforms QtGui hasn't been ported to yet. Task-number: QTBUG-4007 Merge-request: 543 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com> Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| * | Fix missing natively supported mime types for help viewer.kh12010-04-073-19/+61
| | | | | | | | | | | | | | | Task-number: QTBUG-9651 Reviewed-by: ck
| * | qdoc: Added many png, js, and css files for new format.Martin Smith2010-04-0736-1433/+2
| | | | | | | | | | | | | | | | | | Coming soon! Task: QTBUG-9504
| * | qdoc: Added many png, js, and css files for new format.Martin Smith2010-04-0737-0/+1438
| | | | | | | | | | | | | | | | | | Coming soon! Task: QTBUG-9504
| * | qdoc: Added <div> elements to some html output for Fake nodes.Martin Smith2010-04-061-4/+8
| |/ | | | | | | Task: QTBUG-9504
* | Add --download option to runonphoneShane Kearns2010-04-071-36/+42
| | | | | | | | | | | | | | | | | | | | | | runonphone --download <remote file> <local file> Can be used to copy files from the phone to the PC. Typical use would be to get a test log, for example: runonphone -s tst_qdir.sis -d c:\data\log.txt c:\temp\log.txt tst_qdir.exe -o c:\temp\log.txt Reviewed-by: Thomas Zander
* | Implement download support to TRK LauncherShane Kearns2010-04-073-24/+200
|/ | | | | | | | | | | Use the TRK protocol to copy a file from the phone to PC after running the executable. This can be used for example to download a log file containing test results. Submitted upstream as commit 9b65c244d7027d78f0b40450961eab68680d6269. Reviewed-by: Friedemann Kleint
* Make it possible to build QtDBus and its tools on Windows CE.Thiago Macieira2010-04-051-5/+0
| | | | | | | This of course requires installing libdbus compiled for Windows CE too. Task-number: QTBUG-9582 Patch-by: Romain Pokrzywka (from KDAB)
* Fix compilation: Linguist uses QtDeclarative .cpp and private headersThiago Macieira2010-04-021-1/+1
|
* Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-019-42/+222
|\ | | | | | | | | | | | | Conflicts: examples/declarative/proxywidgets/proxywidgets.pro examples/declarative/widgets/mywidgets.pro examples/declarative/widgets/widgets.pro
| * Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-04-0114-225/+457
| |\ | | | | | | | | | | | | Conflicts: src/gui/text/qstatictext.cpp
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-319-42/+222
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (60 commits) Total makeover of SVG image reader Add a QGraphicsItem::updateMicroFocus() to QGraphicsItem. Micro optimization after feedback from Jan-Arve. Show only one dialog when using QFileDialog on Mac. Re-fix compilation: re-add symbols introduced in Qt 4.6.3 to Qt 4.7 Fix bad merge from 4.6. Doc: Updated the qdoc manual with i18n info. Fixed a code example. Fix QStaticText test on Mac Support the pen set on the painter in QStaticText when using rich text Fix setting font for QStaticText on Linux and Mac Hack .pro files on windows to define QT_NO_EGL Fix QDate::isLeapYear() for years < 1 One more test for chinese codecs QScript: More missing APIShim QScriptEngine: Fix reentrency involving creation and desctructions of QScriptEngines Work-around Symbian 10.1's broken egl.h Add some #warnings to debug Symbian EGL build failure Don't detect EGLImage presence by testing function pointers Implement proper QStaticText support in QPaintBuffer Make QStaticText layout lazy ...
| | * \ Merge remote branch 'integration/qt-4.7-from-4.6' into 4.7Olivier Goffart2010-03-311-2/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/modules.qdoc src/gui/graphicsview/qgraphicswidget.h
| | * | | Doc: Updated the qdoc manual with i18n info. Fixed a code example.David Boddie2010-03-302-18/+90
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-301-17/+16
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/phonon/ds9/iodevicereader.cpp
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-307-24/+132
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (47 commits) QScript: More missing APIShim QScriptEngine: Fix reentrency involving creation and desctructions of QScriptEngines Work-around Symbian 10.1's broken egl.h Add some #warnings to debug Symbian EGL build failure Don't detect EGLImage presence by testing function pointers Implement proper QStaticText support in QPaintBuffer Make QStaticText layout lazy Change QStaticText::setMaximumSize() to setTextWidth() Respect QPainter::pen() in QPainter::drawStaticText() QVarLenghtArray: add some API to be consistant to QVector Don't try to resolve EGLImage function pointers if they are defined Change ORs to ANDs when checking EGLImage extension defines Protect EGLImage function definitions in #ifdef Fix a bug in greek shaping causing infinite loops Define QT_NO_EGL in configure.exe improve mingw 64 bit support Fix build on Windows Round instead of ceil font metrics when ForceIntegerMetrics is enabled cetest: remove source file duplicates from cetest.pro Remove EGLImage create/destroy resolving from VG pixmap data ...
| | | * | | | Define QT_NO_EGL in configure.exeTom Cooksey2010-03-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the "proper" fix for the windows build failure introduced by 75bb84ac. a44026a3 should be reverted once configure.exe is rebuilt to incorperate this fix. Reviewed-By: Marius Storm-Olsen
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-266-24/+128
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (29 commits) cetest: remove source file duplicates from cetest.pro Remove EGLImage create/destroy resolving from VG pixmap data Avoid having to create temporary QPixmaps when binding to texture Implement Texture-From-Pixmap using EGLImage extensions on X11/EGL Stabilize tst_QTreeView::taskQTBUG_9216_setSizeAndUniformRowHeightsWrongRepaint QMetaObject::normalizeType: Fix parsing of type which contains "const" in names QMetaObject::normalizeType: fix uses of const and template. Synchronize rich text and plain text code paths in QStaticText Paintbuffer single frame profiling. Optimized ARGB32PM on RGB16 blending with opacity using NEON. Optimized SourceOver and 16 bit dest fetches, dest stores using NEON. Optimized scaled/transformed image blending for ARGB32PM and RGB16 on RGB16. Included ARM NEON optimizations from pixman in Qt. Safeguard the colortable access when converting corrupted indexed8 Fix QItemDelegate::textRectangle Fix bad merge Fix wrong arguments order in a warning in QObject::moveToThread Fix warnings and build on mingw Fixes a deadlock with streaming in Phonon. cetest build fix ...
| | | | * | | | cetest: remove source file duplicates from cetest.proJoerg Bornemann2010-03-261-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | epocroot.cpp and registry.cpp are already in qmake_include.pri
| | | | * | | | Paintbuffer single frame profiling.Samuel Rødal2010-03-261-9/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new --instrumentframe=X argument which gives a detailed run-down of how many milliseconds each paint command of that frame takes. Reviewed-by: Gunnar Sletta