summaryrefslogtreecommitdiffstats
path: root/doc/src
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Removing section about Multimedia - playback and declarative elements. ↵Morten Engvoldsen2010-09-161-9/+0
| | | | This was descoped from Qt 4.7.
* git Merge branch '4.7-upstream' into 4.7-docJesper Thomschutz2010-09-151-1/+1
|\ | | | | | | | | Conflicts: src/gui/kernel/qgesturemanager.cpp
| * Revert "Doc: fixing page name bug caused by ↵Morten Engvoldsen2010-09-101-1/+1
| | | | | | | | | | | | | | 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page" Doc: pulling back redundant fix that is breaking links - qmlelements.html/declarativeelements.html This reverts commit 064b7fe6f97bcf214f749794c5ccab3b4cf0bcc7.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-09-10100-998/+2788
|\ \
| * | Doc: Added info on compression to rcc docsGeir Vattekar2010-09-101-1/+21
| | | | | | | | | | | | | | | Task-number: QTBUG-9946 Reviewed-by: David Boddie
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-0999-997/+2767
| |\ \ | | |/
| | * Ignore MAKEFILE variable for Symbian abld and sbsv2 builds.Miikka Heikkinen2010-09-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Renaming makefile makes little sense for Symbian toolchains, when we generate so many other files filenames derived from other sources. Task-number: QTBUG-13336 Reviewed-by: Janne Anttila
| | * Document difference between property binding and assignmentBea Lam2010-09-082-5/+62
| | | | | | | | | | | | Task-number: QTBUG-12629
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-074-14/+17
| | |\
| | * \ Merge branch '4.7' into qmldocsDavid Boddie2010-09-075-28/+55
| | |\ \
| | * | | Doc: More work on the QML documentation.David Boddie2010-09-0712-65/+407
| | | | |
| | * | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-066-0/+60
| | |\ \ \
| | * | | | Doc: Worked on two more elements, replacing an image.David Boddie2010-09-063-2/+2
| | | | | |
| | * | | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-035-78/+29
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/declarative/qml-intro/basic-syntax.qml
| | * | | | | Doc: qdoc fixes.David Boddie2010-09-021-2/+2
| | | | | | |
| | * | | | | Doc: Fixed autotest breakage caused by snippets.David Boddie2010-09-0113-16/+124
| | | | | | |
| | * | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-015-317/+287
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativetext.cpp src/declarative/graphicsitems/qdeclarativetextedit.cpp
| | * | | | | | Doc: More work on QML documentation and snippets.David Boddie2010-09-016-1/+80
| | | | | | | |
| | * | | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-08-277-0/+47
| | |\ \ \ \ \ \
| | * | | | | | | Doc: Fixed links and markup.David Boddie2010-08-271-5/+5
| | | | | | | | |
| | * | | | | | | Doc: More work on the QML documentation.David Boddie2010-08-2726-5/+692
| | | | | | | | |
| | * | | | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-08-2431-43/+375
| | |\ \ \ \ \ \ \
| | * | | | | | | | Doc: Minor improvements and fixes.David Boddie2010-08-242-5/+5
| | | | | | | | | |
| | * | | | | | | | Doc: Started to improve QML reference documentation.David Boddie2010-08-231-2/+2
| | | | | | | | | |
| | * | | | | | | | Doc: Moved the inline code into snippet files.David Boddie2010-08-231-57/+10
| | | | | | | | | |
| | * | | | | | | | Doc: Started to reorganize the QML documentation structure.David Boddie2010-08-231-30/+67
| | | | | | | | | |
| | * | | | | | | | Doc: Used snippets for the Beginning QML document. License update.David Boddie2010-08-2318-13/+715
| | | | | | | | | |
| | * | | | | | | | Doc: Updated QML snippets.David Boddie2010-08-232-5/+5
| | | | | | | | | |
| | * | | | | | | | Doc: Updated licenses to the three clause BSD license.David Boddie2010-08-2326-730/+704
| | | | | | | | | |
| | * | | | | | | | Doc: Made more improvements to the QML documentation.David Boddie2010-08-2316-80/+612
| | | | | | | | | |
| | * | | | | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-08-1746-341/+762
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Doc: Started work to tidy up existing QML docs.David Boddie2010-08-1718-26/+409
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | | | | | | | Clarified the coding standard regarding connecting signals to slots.Jerome Pasion2010-09-102-3/+15
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleaned up the contradiction identified in QTBUG-10114. Reviewed-by: David Boddie Bug: QTBUG-8961, QTBUG-10114
* | | | | | | | | | Merge branch '4.7-oslo1' into 4.7-docA-Team2010-09-071-54/+55
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-071-54/+55
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Always call QPainter::end() before using the object drawn to. Doc: Reworded a brief description for clarity. Doc: Added a small note about using .pro files in SUBDIRS.
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-075-28/+55
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-066-0/+60
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-025-76/+29
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-0123-351/+1406
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-277-0/+47
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-2431-44/+375
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-1746-341/+762
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Doc: Added a small note about using .pro files in SUBDIRS.David Boddie2010-08-171-54/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Details: Found while trying to fix example .pro files. Reviewed-by: Trust Me
* | | | | | | | | | Merge branch '4.7-oslo1' into 4.7-docA-Team2010-09-078-20/+62
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c ↵Morten Engvoldsen2010-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changing qml elements page
| * | | | | | | | | Doc: updating details on Tier 2 platformsMorten Engvoldsen2010-09-071-5/+4
| | | | | | | | | |
| * | | | | | | | | Doc: adding remark on release of qt quick element support in creatorMorten Engvoldsen2010-09-071-1/+2
| | | | | | | | | |
| * | | | | | | | | Doc: updating the qdocconf files and the stylesheetMorten Engvoldsen2010-09-071-7/+10
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDocconf files was out of date in the section including extra files Style now shows numbered lists corectly
| * | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-09-061-0/+10
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-034-24/+55
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (24 commits) rebuild configure.exe Fix dependencies so JOM will handle parallellization properly Symbian: Disable IPv6 for now Doc: Fixed namespaced Qt build breakage in the model/view tutorial. Doc: Fixing links on index page and corecting HTML in the template. Accept empty authority segments in QUrl as different from not-present Doc: Adds line about non-support for Webkit on Solaris protect nil dictionary from release. Fix potential KERN-EXEC 0 on Symbian. Ukrainian translation updated Fix remote crash in delivering D-Bus calls with too few arguments Ensure that OpenGL contexts are attached to an NSView before first paint Doc: Updating the 3rd party lib used in Qt - including JQuery Doc: Changed the default URL to avoid a Flash plugin crash on x86-64. Reduce memory consumption of QtScript/JSC on Symbian Doc: Updated Supported Platforms page. Finished New binary of configure.exe with -mp/-no-mp option Turn Makefile.win32 into batch-mode, enable /MP and PCH Add option to enable -MP compile option for MSVC Rewrite ucstrcmp in terms of ucstrncmp ...