summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | | | * | | | | Make the Direct Show media service compile with a Qt namespace.Andrew den Exter2010-02-251-2/+2
| | | | | | | | * | | | | Make the Direct Show media service compile with mingw.Andrew den Exter2010-02-2510-45/+152
| | | | | | | | * | | | | Test for the existance of the Windows Media SDK in configure.Andrew den Exter2010-02-252-2/+11
| | | | | | | | * | | | | Remove all uses of __uuidof from the Direct Show media service.Andrew den Exter2010-02-2510-51/+59
| | | | | | | | |/ / / /
| | | | | | | | * | | | QT7; Add support for setting cookies when loading a movie.Justin McPherson2010-02-251-4/+27
* | | | | | | | | | | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-271-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-27104-677/+1772
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | * | | | | | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-26101-1087/+13878
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-265-6/+60
| | | |\ \ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-2733-199/+517
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Autotest: no need to call exitLoop twice, from two threads.Thiago Macieira2010-02-271-3/+1
| * | | | | | | | | | | | Merge remote branch 'origin/master' into 4.7Thiago Macieira2010-02-272410-142245/+160750
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-273-4/+285
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-273-4/+285
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | QMainWindow would show hidden QDockwidget when calling rstoreDockWidgetThierry Bastian2010-02-261-2/+1
| | * | | | | | | | | | | Compile on WinCEaavit2010-02-252-2/+284
* | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-27104-677/+1772
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-26104-677/+1772
| |\ \ \ \ \ \ \ \ \ \ \ \ |/ / / / / / / / / / / / /
| * | | | | | | | | | | | Merge remote branch 'origin/master' into berlin-masterJoerg Bornemann2010-02-262339-141497/+153693
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | fix "configure -fast" on Windows for other maketools than nmakeJoerg Bornemann2010-02-262-1/+1
| * | | | | | | | | | | | Get qmake to add pdb files to install target in debug configuration.Sean Harmer2010-02-262-0/+18
| * | | | | | | | | | | | add TARGET_PLATFORM to qmakespecs with MAKEFILE_GENERATOR = UNIXOswald Buddenhagen2010-02-2667-0/+67
| * | | | | | | | | | | | give symbian an own platform modeOswald Buddenhagen2010-02-266-91/+19
| * | | | | | | | | | | | deprecate -win32/-unix/-macx which set both host and target modeOswald Buddenhagen2010-02-261-3/+3
| * | | | | | | | | | | | decouple host platform mode from target platform modeOswald Buddenhagen2010-02-268-16/+110
| * | | | | | | | | | | | factor out applyHostMode()Oswald Buddenhagen2010-02-262-9/+14
| * | | | | | | | | | | | make QMAKE_QMAKE and QMAKE_EXT_OBJ magic builtinsOswald Buddenhagen2010-02-261-9/+13
| * | | | | | | | | | | | use QDir::separator() instead of Option::dir_sep where appropriateOswald Buddenhagen2010-02-263-3/+3
| * | | | | | | | | | | | simplify string opsOswald Buddenhagen2010-02-261-1/+1
| * | | | | | | | | | | | sanitize evaluation of OS scopesOswald Buddenhagen2010-02-261-13/+14
| * | | | | | | | | | | | instead of hard-coding recursion for symbian, add it to the specsOswald Buddenhagen2010-02-263-4/+2
| * | | | | | | | | | | | add possibility to request project recursion from within a pro fileOswald Buddenhagen2010-02-266-14/+44
| * | | | | | | | | | | | fix ts-assistant targetOswald Buddenhagen2010-02-251-1/+1
| * | | | | | | | | | | | use QList::reserve() as appropriateOswald Buddenhagen2010-02-252-0/+6
| * | | | | | | | | | | | optimize appending of (empty) lists to (empty) listsOswald Buddenhagen2010-02-251-9/+16
| * | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-2417-512/+1449
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | suppress pointer aliasing warningsOswald Buddenhagen2010-02-241-3/+6
| | * | | | | | | | | | | Fix compilation with namespace.ck2010-02-241-0/+1
| | * | | | | | | | | | | Assistant: Make ~AbstractHelpViewer() virtual.ck2010-02-241-1/+1
| | * | | | | | | | | | | Prepare German translations for 4.7 (except Quick).Friedemann Kleint2010-02-245-488/+1416
| | * | | | | | | | | | | tr()-Fixes in Assistant/QHelpLib code.Friedemann Kleint2010-02-243-10/+10
| | * | | | | | | | | | | Remove QObject::tr() in the network module code.Friedemann Kleint2010-02-246-10/+15
* | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-02-26101-1087/+13878
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch '4.6'Miikka Heikkinen2010-02-267-8/+64
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Added addMMPRules for adding conditional MMP_RULESMiikka Heikkinen2010-02-264-1/+55
| | * | | | | | | | | | | Allow overriding TARGET.EPOCHEAPSIZE with MMP_RULESMiikka Heikkinen2010-02-261-5/+5
| | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-2616-250/+242
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-262-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Fix for cetest.David Laing2010-02-262-2/+4
| | |/ / / / / / / / / / /