summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove license headers from .pro files in new modelview examples.Jason McDonald2010-07-177-280/+0
| | | | | | | | This commit attempts to fix the latest staging failure. According to Nokia Legal, .pro files are not copyrightable and thus need not carry license headers. In any case, C-style comments aren't valid for .pro files and broke the build.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-1690-97/+6218
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) Doc: Added license documentation for 3rd party code and data. Do not crash if addrinfo signal does not contain ip address information. Link to the unsinstalled libraries first. Doc: Excluded the QML documentation from the Qt-only set. Doc: Whitespace fixes. Doc: Fixed whitespace issues. Revert the change in applicationShouldTerminate(). Added LatinAmericaAndTheCaribbean country to the doc. Network Proxy Query: Fix memleak on OS X Doc: Reviewed Michael's model/view tutorial and overview document. Doc: Removed accidentally committed file. Doc: Fixed incorrect QML property type. new image for tutorial.qdoc replaced image, license headers, more links in modelview.qdoc file Doc: Added the standard three clause BSD license header. I've cleaned up the qdoc file a bit. correction of snippet tags integrating modelview tutorial in the build system, first attempt new version of modelview.qdoc with snippets Rolands ModelView Source ...
| * Doc: Added license documentation for 3rd party code and data.David Boddie2010-07-162-16/+267
| | | | | | | | | | | | Task-number: QT-3585 Pre-approved-by: Legal Reviewed-by: Trust Me
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-07-16467-8867/+19403
| |\ | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt.qdocconf
| | * Do not crash if addrinfo signal does not contain ip address information.Jukka Rissanen2010-07-161-0/+3
| | | | | | | | | | | | | | | Fixes: NB#176643 - Segmentation fault occurs while using networking Reviewed-by: Adrian Constantin
| | * Link to the unsinstalled libraries first.Petri Latvala2010-07-161-1/+1
| | | | | | | | | | | | | | | Task-number: QT-3371 Reviewed-by: Harald Fernengel
| | * Revert the change in applicationShouldTerminate().Fabien Freling2010-07-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It used to fix an issue during logout but it seems to be fine now. Related issue: QTBUG-6296 Task-number: QTBUG-10993 Reviewed-by: Morten Sorvig
| | * Added LatinAmericaAndTheCaribbean country to the doc.Denis Dzyubenko2010-07-161-0/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-12063 Reviewed-by: trustme
| | * Network Proxy Query: Fix memleak on OS XMarkus Goetz2010-07-161-1/+4
| | | | | | | | | | | | Task-number: QTBUG-12106
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-07-16101-855/+1920
| | |\
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-07-1453-464/+1179
| | |\ \
| | * \ \ Merge branch '4.7' of ../oslo-staging-1 into 4.7Lorn Potter2010-07-14801-16821/+22705
| | |\ \ \
| | * \ \ \ Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7Lorn Potter2010-06-30111-325/+653
| | |\ \ \ \
| | * | | | | make sure ap's are removed when the device is removedLorn Potter2010-06-303-28/+74
| | | | | | |
| | * | | | | Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7Lorn Potter2010-06-2841-268/+461
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7Lorn Potter2010-06-271791-47018/+36491
| | |\ \ \ \ \ \
| | * | | | | | | fix actions regarding removal of connman. make tests pass on desktopLorn Potter2010-06-272-81/+91
| | | | | | | | |
| | * | | | | | | Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7Lorn Potter2010-06-21123-548/+2342
| | |\ \ \ \ \ \ \
| | * | | | | | | | fix ghost ap issue, and dont block on connectLorn Potter2010-06-212-82/+235
| | | | | | | | | |
| | * | | | | | | | Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7Lorn Potter2010-06-17626-7031/+13947
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | initial connman bearer backend.Lorn Potter2010-06-077-1/+2324
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | still needs work, debugging, additional threading support, and probably refactoring. This includes a connman dbus service wrapper that has more functionality than is needed by the bearer backend but still missing some 'set' functionality for a complete connman wrapper. Developed with wifi/desktop on 'lucid' kubuntu, using the connman available at http://ppa.launchpad.net/indicator-network-developers/ppa/ubuntu
| * | | | | | | | | | Doc: Excluded the QML documentation from the Qt-only set.David Boddie2010-07-163-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | | | | | Doc: Whitespace fixes.David Boddie2010-07-162-57/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | | | | | Doc: Fixed whitespace issues.David Boddie2010-07-162-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | | | | | Doc: Reviewed Michael's model/view tutorial and overview document.David Boddie2010-07-1319-376/+564
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | | | | | Doc: Removed accidentally committed file.David Boddie2010-07-091-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-07-0917-73/+100
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Doc: Fixed incorrect QML property type.David Boddie2010-07-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-07-0843-713/+311
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of ../msculls-modelview-qdoc-enhancement into 4.7David Boddie2010-07-0770-1/+3117
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | new image for tutorial.qdocMichael D Scull2010-07-073-9/+118
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | replaced image, license headers, more links in modelview.qdoc fileMichael D Scull2010-07-0739-15/+1495
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Doc: Added the standard three clause BSD license header.David Boddie2010-07-071-1/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | | | | | | | | | I've cleaned up the qdoc file a bit.Michael D Scull2010-07-072-146/+70
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | correction of snippet tagsMichael D Scull2010-07-0715-37/+57
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | integrating modelview tutorial in the build system, first attemptRoland Wolf2010-07-073-2/+6
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | new version of modelview.qdoc with snippetsMichael D Scull2010-07-071-139/+29
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Rolands ModelView SourceMichael D Scull2010-07-0739-0/+809
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | clean up previous test commitRoland Wolf2010-07-071-0/+0
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Michaels first commitMichael D Scull2010-07-0726-0/+840
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | dummy commit to check permissionsRoland Wolf2010-07-071-0/+0
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-1621-137/+825
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix RightBearing confusion in text layout fixes, improvements for various docs and example code Fixed debugger's evaluation of dynamic properties in context Allow test to pass on smaller screens (eg. 480 high). Minor animation doc improvement
| * | | | | | | | | | | | | Fix RightBearing confusion in text layoutmae2010-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Negative RightBearing was wrongly taken into account when calculating the line wrap Reviewed-by: Eskil Abrahamsen Blomfeldt
| * | | | | | | | | | | | | fixes, improvements for various docs and example codeBea Lam2010-07-1617-122/+805
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed debugger's evaluation of dynamic properties in contextLasse Holmstedt2010-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Aaron Kennedy
| * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-07-162-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Minor animation doc improvementMartin Jones2010-07-162-1/+6
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Allow test to pass on smaller screens (eg. 480 high).Warwick Allison2010-07-161-12/+12
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-16156-2375/+3012
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (104 commits) Fixed tst_maketestselftest::tests_pro_files failure remove nasty hack by using a stricter regexp (for language codes) cosmetics: quote the dot in the regexp remove dependency of ts targets on sub-tools add commit-ts target to commit ts files without line number info (re-)add 'untranslated' ts targets more fine-grained ts targets split qt_help out into an own ts target Unbreak the Maemo 5 build after the Symbian fix QNAM HTTP: Fix problem with cached files and metaDataChanged() Add a testcase for QTBUG-11213 to prevent future regressions. Autotest: reenable the NTLM proxy test on tst_QTcpSocket Autotest: add a small, boring test for QAuthenticator Add documentation for the QAuthenticator options. Expose the QAuthenticator map of options in the API. Add a QAuthenticatorPrivate parsing for the headers without QHttpResponseHeader Revert BIC change "Build Qt with option -Zc:wchar_t under MSVC" Fix for tst_qmdisubwindow::fixedMinMaxSize failure on Cocoa Add unit tests for QMimeData. fix qconfig.h reference for shadow builds ...
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-07-1614-13/+131
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/htmlgenerator.cpp
generated by cgit v0.12 at 2025-01-16 19:05:57 (GMT)