summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Expand)AuthorAgeFilesLines
* 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-041-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-011-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-051-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-281-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 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
|\ \ \ \
| * \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-191-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Add /q switch to QMAKE_DEL_FILE command in symbianMiikka Heikkinen2011-03-181-1/+1
* | | | | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-1713-52/+87
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-161-1/+1
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7axis2011-03-1418-162/+291
| | |\ \
| | | * | Removed reference to nonexistant profile.axis2011-03-041-1/+0
| | | * | Corrected a mismerge in GCCE link parameters.axis2011-03-041-1/+1
| | | * | Fixed incorrect referral to an include file.axis2011-03-041-1/+1
| | | * | Fixed GCCE libdir handling if the paths have spaces in them.axis2011-03-041-9/+9
| | | * | Added MinGW support for adding lib prefix and extension via profile.axis2011-03-041-0/+2
| | | * | Stopped honoring the RVCT22INC variable on symbian-armcc mkspec.axis2011-03-041-6/+6
| | | * | Added object script support to RVCT when using MinGW qmake generator.axis2011-03-041-0/+2
| | | * | Added Symbian makefile building support using MinGW backend.axis2011-03-041-1/+5
| | | * | Fixed some tools definitions and properties in symbian profiles.axis2011-03-042-2/+3
| | | * | Added missing header.axis2011-03-041-0/+41
| | | * | Unified the usage of $${EPOCROOT} for symbian.axis2011-03-042-9/+9
| | | * | Added Symbian deployment localization for makefile build system.axis2011-03-044-51/+107
| | | * | Made the translations dependency work for shadow builds.axis2011-03-041-1/+1
| | | * | Fixed PREPEND_INCLUDEPATH being executed too early.axis2011-03-043-16/+15
| | | * | Moved the default dependency targets to default_post.prf.axis2011-03-042-47/+47
| | | * | Fix some build issues for building Qt for Symbian on Mac OS X.axis2011-02-211-1/+2
| | | * | Got rid of some "duplicate library" warnings.axis2011-02-211-1/+1
| | | * | Changed various qmake constructs to support Windows.axis2011-02-182-9/+28