summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-196-168/+162
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1958-1600/+1542
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1987-2395/+2308
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1914-380/+366
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-199-245/+236
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1927-739/+712
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1931-839/+808
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1918-494/+476
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1923-625/+602
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-196-162/+156
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-197-191/+184
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1912-348/+336
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-196-166/+160
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1936-988/+952
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-193-83/+80
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1962-1702/+1640
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1994-2570/+2476
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1914-386/+372
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1921-577/+556
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1920-552/+532
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1911-303/+292
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1916-446/+430
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1987-2375/+2288
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-199-249/+240
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1917-471/+454
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1963-1723/+1660
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-195-139/+134
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1911-303/+292
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1931-861/+830
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1927-747/+720
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-196-166/+160
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1931-845/+814
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1982-2236/+2154
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1926-728/+702
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1919-519/+500
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1928-776/+748
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-19538-57938/+16140
|\
| * Fixed an assert in QMenuThierry Bastian2010-05-192-11/+55
| | | | | | | | | | | | | | | | The code was changed and changed the behaviour. This is basically a kind of revert. Reviewed-By: gabi Task-Number: QTBUG-10735
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-195-9/+27
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix platform regression: Support QFont::setStretch() on Cocoa Fix a memory leak from QItemSelectionModel when changing the model Small hack to allow forcing off font smoothing on Mac OS X
| | * Fix platform regression: Support QFont::setStretch() on CocoaEskil Abrahamsen Blomfeldt2010-05-192-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | QFont::setStretch() would previously have no effect on Mac OS X/Cocoa. Task-number: QTBUG-10585 Reviewed-by: Eskil Done-by: Andy
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-05-19341-56727/+25
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: removed test file, part of mediaservice removal. Rebuild configure.exe Rebuild configure following the removal of media services. More mediaservices removal work. Removed mediaservices.
| | * | removed test file, part of mediaservice removal.Kurt Korbatits2010-05-191-0/+0
| | | | | | | | | | | | | | | | Reviewed-by:Justin McPherson
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-05-18340-56727/+25
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Rebuild configure.exe Rebuild configure following the removal of media services. More mediaservices removal work. Removed mediaservices.
| | | * | Rebuild configure.exeAndrew den Exter2010-05-181-0/+0
| | | | |
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Andrew den Exter2010-05-181362-11510/+22502
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/imports/multimedia/qdeclarativeaudio.cpp src/imports/multimedia/qdeclarativeaudio_p.h src/multimedia/mediaservices/mediaservices.pro src/plugins/mediaservices/mediaservices.pro src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.h src/plugins/mediaservices/symbian/mediaplayer/s60videoplayersession.h src/s60installs/s60installs.pro src/src.pro
| | | * | | Rebuild configure following the removal of media services.Andrew den Exter2010-05-181-0/+0
| | | | | |
| | | * | | More mediaservices removal work.Derick Hawcroft2010-05-181-11/+1
| | | | | |
| | | * | | Removed mediaservices.Kurt Korbatits2010-05-18338-56706/+24
| | | | | |
| * | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-05-19186-1126/+15842
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (74 commits) Fixed tst_compilerwarnings test failure due to icecc node failures. QNAM HTTP: Remove dead code Doc: fix typo QCompleter: fix misuse of QMap that can lead to crashes qmake: added possibility to specify the type of an install target re-add overriding of tool paths to configure fix regexp Support linked fonts (.ltt) from standard font locations. fix path separators in install targets for MinGW+sh fix QMAKE_QMAKE path separator under mingw+sh in the qmake spec define qtPrepareTool() function and use it throughout QS60Style: In S60 3.x and 5.0 Qt itemviews behaviour is not nativelike QNAM HTTP: And one more testcase QNetworkAccessManager: Backends were tried in wrong order Fix QUrl::isValid if the host contains invalid caracter. Fix anomaly demo control strip icon placement QUrl: parsing of host name with an undercore. Fixed race condition compiling xmlpatterns tests. Remove qdbusserver from tests/auto/dbus.pro QNAM HTTP: Preemptive anti crash if() statement ...
| | * | | | Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-05-195-17/+57
| | |\ \ \ \