summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Symbian/trk: Fix debugging output for the N8.Shane Kearns2010-05-113-7/+41
| | | | | | | | | 1. Fix hanging behaviour when we receive a message on the wrong mux in framed mode 2. Treat messages on the trace mux (0102) as debug output 3. Separate timestamp from text in trace messages Reviewed-by: Friedemann Kleint
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-111-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove test cases which cause stack overflow Fix compile errors Run autotests with minimal capabilities Documentation updates for Qt/Symbian on Linux development Allow EPOCROOT env var to be without trailing slash. Workaround for Symbian Open C bug in socket connect. Fix fetchedRoot test variable to work also in Symbian Add configure time checks for symbian environment Check for existance of sis file parameter to runonphone Fix thread synchronization issues in Symbian QFileSystemWatcher Disable compiling of the plugin when extra package not found Added missing UID3 for qsymbianbearer.dll. Enabled previously disabled Qt features. Fix includes so it compiles Use lowercase includes so it compiles in Linux too Fixed library dependency for Gnupoc. Removed the --export_all_vtbl from linking. Cleaned up the elf2e32 options a bit.
| * Check for existance of sis file parameter to runonphoneShane Kearns2010-05-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | Previously, it would skip over a non existant sis file - which could cause invalid test results if a previous version of the sis was already installed. Now, it checks if the file exists and exits with an error message if asked to install a sis file that doesn't exist. Task-number: QTBUG-9290 Reviewed-by: Miikka Heikkinen
* | Resize qmlruntime window to new dimensions when orientation changesJoona Petrell2010-05-072-6/+18
| | | | | | | | | | Task-number: Reviewed-by: Warwick Allison
* | Another initialization fix. Unleak.Warwick Allison2010-05-052-1/+2
| |
* | Fix compile in namespace.Michael Brasser2010-05-051-2/+2
| |
* | Initialize variable and crash less.Martin Jones2010-05-051-0/+1
| |
* | Add a switch to the menu to hide/show the runtime warningsKai Koehne2010-05-055-17/+222
| | | | | | | | Reviewed-by: mae
* | Allow translations without extra command-line args, and document both.Warwick Allison2010-05-052-27/+51
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Warwick Allison2010-05-049-16/+82
|\ \ | |/ | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp
| * only add phonon and scripttools dependencies if they're available, otherwise ↵Romain Pokrzywka2010-05-031-3/+7
| | | | | | | | | | | | | | linking will fail Merge-request: 591 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * qdoc: Added breadcrumbs for most other pages.Martin Smith2010-05-031-0/+8
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-308-13/+67
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (29 commits) bye bye QMakeProjectEnv short-cut evaluation inside if() tests eliminate special splitting of INCLUDEPATH and DEPENDPATH do not env-expand cache file path s/QMAKE_FRAMEWORKDIR_FLAGS/QMAKE_FRAMEWORKPATH_FLAGS/ s/INCPATH/INCLUDEPATH/ s/QMAKE_RPATH/QMAKE_LFLAGS_RPATH/ teach configure QMAKE_LFLAGS_RPATH (in addition to obsolete QMAKE_RPATH) warn about usage of deprecated variables warn about using non-lowercased replace $$function()s add -Wdeprecated option (on by default) make QMakeProject::isEmpty() consider legacy mappings document some functions' scope fix $$size() not using function-scoped variables doc: Fixed some qdoc errors. qdoc: Added breadcrumbs for namespaces. Autotest: check that we receive key events on toplevel widgets Cocoa: key events stopped working Update Polish translations qdoc: Added "All namespaces" to the API Lookup box. ...
| | * doc: Fixed some qdoc errors.Martin Smith2010-04-301-0/+1
| | |
| | * qdoc: Added breadcrumbs for namespaces.Martin Smith2010-04-302-3/+7
| | |
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-302-3/+3
| | |\
| | | * Backport a fix to Designer filterwidgetJens Bache-Wiig2010-04-292-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Using static here is obviously incorrect as the animations are done per widget. Reviewed-by: danimo
| | * | qdoc: Added "All namespaces" to the API Lookup box.Martin Smith2010-04-301-0/+1
| | |/
| | * qdoc: Added breadcrumbs to examples. Coolio.Martin Smith2010-04-293-0/+37
| | | | | | | | | | | | Doesn't work in a few cases because of non-standard naming of things.
| | * qdoc: Sprinkled more breadcrumbs.Martin Smith2010-04-282-9/+20
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-304-13/+10
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (68 commits) Don't create an anchors element so that we can check that there aren't any Ensure eval and Function are in the correct scope Add availableFonts.qml for fonts examples. Add Qt.fontFamilies() method Avoid regenerating PathView delegates needlessly When a model delegate is released, remove it from the scene immediately. Fix assignment of value types to javascript var. More doc fixes Make QDeclarativeParserStatus method pure virtual to encourage right code. Doc fixes Fix error string Add QML value types for math3d types Fix assert in qdeclarativepathview Avoid divisions by zero in qdeclarativetimeline Initialize variable. Doc: mention that size of delegate affects flicking performance. buffer new items on initialization. Compile with QT_NO_GRAPHICSEFFECT. Fix translation context when qsTr is used in PropertyChanges. missed files ...
| * | Make QDeclarativeParserStatus method pure virtual to encourage right code.Warwick Allison2010-04-302-0/+5
| | | | | | | | | | | | | | | Fix all code to be right, except multimedia. Currently, it's not *required* that types work without componentComplete, so not vital.
| * | 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
| * | undebuggeryWarwick Allison2010-04-291-1/+0
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-281-8/+0
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (21 commits) Improve border image documentation. Update border image examples. Doc - micro fix. Fix QML default property HTML generation... again. Alpha needs to be part of rectangle cache key. Bunch of doc fixes. Doc: overview for Image Code cleanup Remove unused variable Don't test snippets with C++ components Don't unnecessarily regenerate property cache Share Rectangle pixmap caches between items. Move snippets to correct location Make compile Benchmark Small cleanups Fix snap at view boundaries with overshoot on. Doc fixes Emit hoverChanged appropriately when Item visibility changes. Delete canvas after use in positioner unit tests ...
| | * Fix QML default property HTML generation... again.Martin Jones2010-04-281-8/+0
| | |
* | | Don't disable the symbian media backend.Andrew den Exter2010-04-291-16/+20
|/ / | | | | | | | | | | | | The absence of the DirectX or Windows SDK is of no relevance to the symbian media backend. Reviewed-by: Derick Hawcroft
* | Fix compile.Aaron McCarthy2010-04-281-1/+1
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-274-29/+68
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix compilation with QT_NO_TEXTSTREAM Fix the compilation with QT_NO_TOOLTIP Add unit tests for a number of QList methods. Crash while dragging on Mac OS X (Cocoa) Doc & menubar hidden for QtDemo after switching back from fullscreen qdoc: Added breadcrumbs for class pages. QTabWidget documentMode not working correctly on Mac qdoc: Removed MacRefs for Xcode documentation stuff. Slight QList documentation fix.
| * qdoc: Added breadcrumbs for class pages.Martin Smith2010-04-272-27/+19
| |
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-279-49/+50
| |\
| * | qdoc: Removed MacRefs for Xcode documentation stuff.Martin Smith2010-04-273-3/+50
| | | | | | | | | | | | Also added the infrastructure for generating breadcrumbs.
* | | 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
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-264-15/+24
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: 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. Replace usage of print() with console.log(). Remove out-of-date performance doc. Fix hidden menu on embedded. Location of binary is not on installed-content import path. Doc fixes. Return null if creation fails. Basic Component doc. Collection of small doc improvements compile
| | * | Unify naming of settings / UI to be "Qt Qml Runtime"Kai Koehne2010-04-263-6/+7
| | | | | | | | | | | | | | | | Reviewed-by: Henrik Hartz
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-243-9/+17
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Link to example files from tutorial pages Add tutorial for writing QML extensions no export in plugin Add doc pages for qml examples. Replace usage of print() with console.log(). Remove out-of-date performance doc. Fix hidden menu on embedded. Location of binary is not on installed-content import path. Doc fixes. Return null if creation fails. Basic Component doc. Collection of small doc improvements compile
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-243-9/+17
| | | |\ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Link to example files from tutorial pages Add tutorial for writing QML extensions no export in plugin Add doc pages for qml examples. Replace usage of print() with console.log(). Remove out-of-date performance doc. Fix hidden menu on embedded. Location of binary is not on installed-content import path. Doc fixes. Return null if creation fails. Basic Component doc. Collection of small doc improvements compile
| | | | * 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
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-264-29/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: add translator comment save a QFile::encodeName() Don't use QList's begin() and end() where possible. Ensure we stop the name lookups in QAbstractSocket if we abort(). Don't rely on tryStart() to do job control. Improved workaround for new qt documentation, base on dboddie's work. Doc: Fixed typos. Ensure that all qthelp URLs have paths that start with /qdoc/. Doc: Fixed the Declarative documentation set. Tweaked the others.
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-04-2618-134/+387
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/assistant/tools/assistant/helpviewer.cpp tools/assistant/tools/assistant/helpviewer_qwv.cpp
| | * | | | | Improved workaround for new qt documentation, base on dboddie's work.kh12010-04-263-13/+12
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the check more generic, to also work for all other Qt namespaces than qt.ver.s.ion. Still there's something broken in Qt webkit or so. Backported from Qt Creator code. Reviewed-by: ck
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-04-231-13/+30
| |\ \ \ \ \
| * | | | | | Ensure that all qthelp URLs have paths that start with /qdoc/.David Boddie2010-04-232-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: kh
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-04-221-40/+39
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qdeclarative.qdocconf
| * | | | | | | Doc: Fixed the Declarative documentation set. Tweaked the others.David Boddie2010-04-225-26/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-261-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: DEF file updates for BWINS and EABI for Symbian Fix typo Revert "Add QML imports to s60installs.pro" Assigned a UID3 to qml.exe.
| * | | | | | | Assigned a UID3 to qml.exe.Frans Englich2010-04-261-1/+1
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Allocated in S60 Team's wiki over UID3s in Qt.
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-261-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: correcting a character bug in the footer.