summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into qtquick2axis2011-04-2618-53/+60
|\
| * Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-1818-53/+60
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-181-22/+27
| | |\
| | | * Add new QSysInfo::symbianVersion() enumsMiikka Heikkinen2011-04-181-22/+27
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-151-1/+1
| | |\|
| | | * Trigger fullscreen transition effects properly on app exit.Laszlo Agocs2011-04-141-1/+1
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-135-8/+15
| | |\|
| | | * Add the rules for gcce in do_not_build_as_thumb.prfLiang Qi2011-04-071-0/+5
| | | * Correct some parameters for the makefile build sytem, armcc and gcceLiang Qi2011-04-072-7/+6
| | | * Support QMAKE_LFLAGS.ARMCC and QMAKE_LFLAGS.GCCE in makefile build systemLiang Qi2011-04-072-1/+4
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-1213-22/+17
| | |\ \
| | | * | make uic3-generated moc files depend on mocinclude.tmpOswald Buddenhagen2011-04-121-0/+1
| | | * | clean up visual studio identification codeOswald Buddenhagen2011-04-1212-22/+16
| * | | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-04-1411-51/+68
| |\ \ \ \
* | \ \ \ \ Merge branch 'master' into qtquick2Michael Brasser2011-04-1410-47/+64
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-04-101-1/+1
| |\ \ \ \ \
| | * \ \ \ \ Merge remote branch 'qt-mainline/master'aavit2011-04-073-11/+15
| | |\ \ \ \ \
| | * | | | | | Fixes: The "test: too many arguments" error after every makeaavit2011-04-071-1/+1
| * | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-075-7/+29
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | / / / | | | |_|/ / / | | |/| | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-061-0/+8
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | Improve Flickable dynamics and allow platform specific tweaking.Martin Jones2011-04-061-0/+8
| | * | | | | win32-g++: Correct the order of linked Windows librariesMark Brand2011-04-051-1/+1
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-051-1/+1
| | |\ \ \ \ \
| | | * | | | | win32-g++: Correct the order of linked Windows librariesJonathan Liu2011-04-041-1/+1
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-041-2/+5
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | / | | | | |_|_|/ | | | |/| | |
| | | * | | | Do not add project path to SYMBIAN_MATCHED_TRANSLATIONS if not neededMiikka Heikkinen2011-04-041-2/+5
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-021-0/+11
| | |\| | | |
| | | * | | | Add the auto detection for OpenGL in configure for makefile build system on S...Liang Qi2011-04-011-0/+11
| | * | | | | Remove useless LFLAGSDarryl L. Miles2011-03-312-2/+2
| | * | | | | Merge remote-tracking branch 'mainline/4.7' into 4.7Oswald Buddenhagen2011-03-312-27/+18
| | |\ \ \ \ \
| | * | | | | | use mkdir -p for mingw+shOswald Buddenhagen2011-03-311-1/+1
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-04-061-9/+13
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote branch 'qt-master/master'Guoqing Zhang2011-04-0518-414/+408
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | * | | | | | | Make createpackage and patch_capabilties scripts use tmp dirMiikka Heikkinen2011-03-222-10/+13
| | * | | | | | | Add ".make.cache" to the files to be cleaned for symbian-abld.Miikka Heikkinen2011-03-171-0/+1
| | * | | | | | | Fix mismatched $$translations handling after mergeMiikka Heikkinen2011-03-161-1/+1
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-04-052-2/+2
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Fixed deployment problems with MSVC 2005 and 2008 SP1Florent Chantret2011-04-052-2/+2
| * | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-313-29/+20
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-291-2/+2
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | / / / | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | fix -enable-stdcall-fixup usageMark Brand2011-03-281-2/+2
| | * | | | | | QSysInfo support for next generation Symbian devices.Miikka Heikkinen2011-03-242-27/+18
| | |/ / / / /
* | | | | | | Merge remote branch 'lighthouse/master' into qtquick2Samuel Rødal2011-04-062-1/+7
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Compile fixes for GL ES and Maccon2011-04-052-1/+7
* | | | | | | Merge remote branch 'lighthouse/master' into qtquick2Samuel Rødal2011-03-312-0/+4
|\| | | | | |
| * | | | | | Use the new QT_QPA_DEFAULT_PLATFORM_NAME define.con2011-03-222-0/+4
* | | | | | | Merge branch 'master' into qtquick2Yann Bodson2011-03-292-4/+4
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-03-281-3/+3
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Make QtUiTools use the lib-infix passed to configure.Friedemann Kleint2011-03-251-3/+3
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-221-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |