summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-051-2/+2
|\
| * Fix build key on Windows with MinGW.Daniel Molkentin2010-05-051-1/+1
| | | | | | | | | | | | Also, rebuilt configure.exe Reviewed-by: Thiago Macieira
| * correct misleading note in configure on WindowsPeter Hartmann2010-05-051-1/+1
| | | | | | | | | | | | | | the option given in the note would not work if used as described. Reviewed-by: Zeno Albisser Task-number: QTBUG-2089
* | doc: Began reorganization of the top doc page.Martin Smith2010-05-051-13/+6
|/ | | | Much more to come.
* qdoc: Removed [module name] from class ref pages.Martin Smith2010-05-051-0/+3
| | | | The module name is now a breadcrumb.
* Doc: Updating style and HTML in CSS and qdocMorten Engvoldsen2010-05-041-6/+6
| | | | | | Adding all classnames generated in qdoc to the CSS and removing redundant   from htmlgenerator. Reviewed-by: Trust Me
* qdoc: Fixed the alphabet index in the compact list.Martin Smith2010-05-041-9/+4
| | | | | | Now it leaves out any letter that doesn't appear in the list. i.e. If there are no classes that begin with QJ... J does not appear in the alphabet index.
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-05-042-13/+37
|\
| * qdoc: Fixed some breadcrumbs.Martin Smith2010-05-041-0/+1
| |
| * qdoc: Fixed class list problem.Martin Smith2010-05-042-13/+36
| | | | | | | | | | Task: QTBUG-10373 Task: QTBUG-10382
* | Doc: A number of fixes and updates for the new design. See detailsMorten Engvoldsen2010-05-0413-770/+723
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | index.qdoc updated the HTML to use sprites images - deleted obsolete images from templates/images images - added new images to templates/images styles.css - updated styles to handle index, sprites and templates correct. assistant.qdoconf - updates images designer.qdoconf - updates images linguist.qdoconf - updates images declarative.qdoconf - updates images qmake.qdoconf - updates images qt-build-docs.qdoconf - updates images qt-build-docs_zh_CN.qdoconf - updates images qt-defines.qdoconf - updates images qt.qdoconf - updates images qt_zh_CN.qdoconf - updates images qt-htmlTemplates.qdoconf - updated template to use sprites declarativeui.qdoc - removed <br> Reviewed-by: Trust Me
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-05-0310-28/+94
|\ \ | |/
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-031-3/+7
| |\
| | * 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 more API topics. Are these important?Martin Smith2010-05-033-4/+11
| |/
| * 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.
| * | 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
* | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-04-292-9/+20
|\ \ \ | | |/ | |/|
| * | qdoc: Sprinkled more breadcrumbs.Martin Smith2010-04-282-9/+20
| |/
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-04-285-17/+26
|\ \ | |/
| * 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.
| * \ 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 git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-04-272-27/+19
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | qdoc: Added breadcrumbs for class pages.Martin Smith2010-04-272-27/+19
| | | | | | |
* | | | | | | Doc: updating and cleaning up redundant HTML code in the HTML generatorMorten Engvoldsen2010-04-271-10/+10
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved element attribute class="fn" from <div> to <li>. Removed redundant <div>s Reviewed-by: Martin Smith
* | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-279-49/+50
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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.