summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Just use the path as the url can have an anchor attached etc...kh12010-04-212-4/+5
| | | | | | | | | Fixes the broken topic chooser and keyword resolving. We are only interested in the extention, which fails if we get an url e.g. with anchor attached. Reviewed-by: ck (cherry picked from commit 139497b6871d73d3366c21b51db9a74046855552)
* qdoc: Avoided putting bad chars in linksMartin Smith2010-04-212-7/+10
| | | | (cherry picked from commit 0a6faf00f06c8a0e2e0f4714bb14645172ee8922)
* Revert "Make offline docs the default for package generation."Jason McDonald2010-04-211-0/+1
| | | | This reverts commit d66a6da84af01f1a6d4fd52d9b1cbec72a4fae3c.
* Doc: Cleaning HTML generator and updating index.qdocMorten Engvoldsen2010-04-212-73/+68
| | | | | | | Adding links to the index page and removing HTML attributes like align and valing form the HTML generator Reviewed-by: Martin Smith (cherry picked from commit 019af5ecb5dbc9c173109ba670180177713a51ad)
* Doc: Correcting qdocconf files for assistantMorten Engvoldsen2010-04-204-28/+53
| | | | | | | Linking correct files to the qdocconf files Reviewed-by: Daniel Molkentin (cherry picked from commit 84eadc0bc232d8196e08f5aa5614ce9a17ea93bd)
* Quick fix to make the documentation work, needs a proper solution though.kh12010-04-203-4/+23
| | | | | Reviewed-by: kh (cherry picked from commit 0fd81e81a357edb9f9e615cff28a1876bd363b2e)
* Make offline docs the default for package generation.Jason McDonald2010-04-201-1/+0
| | | | Acked-by: Martin Smith
* qdoc: Added online flag to the qdocconf file.Martin Smith2010-04-194-141/+157
| | | | | | | | To generate the offline docs, do nothing. To generate the online docs, add this to your qdocconf file: "online = true" (cherry picked from commit 22c44d7da7682fb2500c9b11c884e50ed4dcd042)
* qdoc: Improved TOC for class ref pages.Martin Smith2010-04-182-10/+39
| | | | (cherry picked from commit 8c942f6d2998ffcd024437e408f92d38750dd025)
* qdoc: Added the index and fixed images in the extra files list.David Boddie2010-04-165-27/+30
| | | | | Reviewed-by: Trust Me (cherry picked from commit 5b975e1dc61eaee055afc40fef13358bcd55c7d2)
* qdoc: Added TOC to module pages.Martin Smith2010-04-161-15/+19
| | | | (cherry picked from commit 68eea9b1006074853a42853f9a34cc4eb1e04b8f)
* qdoc: Changed <ul> elements in TOC.Martin Smith2010-04-161-2/+11
| | | | | Each <ul> is now <ul class="leveli">, where i is 1..n. (cherry picked from commit 3d3bff79216a24625ac7e5aa33b40c5363a228fc)
* QtMediaservices -> QtMediaServices.Justin McPherson2010-04-161-5/+5
| | | | | Reviewed-by: Dmytro Poplavskiy (cherry picked from commit 24d5c396903c1ce12578a32c2cc10e0ae391e6d5)
* Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-161-15/+27
| | | | (cherry picked from commit e85223d233c0e1d6beca748332b8fbaba3ebbf2d)
* qdoc: Removed all <table> attributes in favor of using css.Martin Smith2010-04-151-40/+25
| | | | (cherry picked from commit a3c73742d9b9b9329492f8f70d74d6701840062f)
* qdoc: Checked for empty title.Martin Smith2010-04-151-2/+4
| | | | (cherry picked from commit 4607210dfef3b51933f03deab1037c98cbb8869c)
* qdoc: Added TOC to class ref pages.Martin Smith2010-04-151-0/+1
| | | | | | | It isn't a full TOC yet. It only includes h1, h2, etc from the Detaled Description part. In many classes, there aren't any of these, so many classes won't have a TOC yet. (cherry picked from commit 61726600cc7d6412a3d25674a4f785c23c8a8f64)
* Doc: Fixing design bugs. Updating the index page and script/style files. ↵Morten Engvoldsen2010-04-158-13/+1246
| | | | | | | Adding some image files. Reveiwed-by: trustme (cherry picked from commit c0d02030333c9f96188b5a425f2552472ab53325)
* qdoc: Fixed .qdocconf files for assistant.Martin Smith2010-04-154-4/+113
| | | | (cherry picked from commit 114cb018c088570ff0640eeb0d57594905ff9fcf)
* Reduce QML runtime capabilities to NetworkServices and ReadUserDataJoona Petrell2010-04-151-1/+1
| | | | | | Task-number: Reviewed-by: Martin Jones (cherry picked from commit 5a1a3ab59e96bb5b2968883160564eb24d011859)
* Add 'runtime' property to the rootContext of DeclarativeViewerLeonardo Sobral Cunha2010-04-152-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 (cherry picked from commit ffd45093795e9481505af0ae9bf5df7b6c704c72)
* 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