summaryrefslogtreecommitdiffstats
path: root/mkspecs
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2711-38/+67
|\
| * Merge branch 'macMakefileBuildSupport' into master.Liang Qi2010-10-2611-38/+67
| |\
| | * Got rid of some "duplicate library" warnings.axis2010-10-211-1/+1
| | * Changed various qmake constructs to support Windows.axis2010-10-212-9/+28
| | * Fixed various quotation problems when porting to Windows.axis2010-10-212-8/+13
| | * Fixed some preprocessor parameters for Mac support.axis2010-10-211-4/+4
| | * Added detection of bat files to the qtPrepareTool function.axis2010-10-211-1/+7
| | * Renamed the symbian/linux-* mkspecs to symbian-*.axis2010-10-218-18/+18
| | * Fixed library ordering when linking to qtmain.axis2010-10-211-2/+7
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2611-12/+317
|\ \ \ | |/ /
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-253-4/+9
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-181-0/+4
| | |\ \
| | | * | Prepend epocroot to extra target tools if they start with /epoc32/Miikka Heikkinen2010-10-181-0/+4
| | * | | qmake/symbian: Make sure the destination directory exists before copyingMartin Storsjo2010-10-181-1/+1
| | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-131-3/+4
| | |\ \
| | | * | use specified pkg-configMark Brand2010-10-111-3/+4
| * | | | Fix linux-clang license headerTor Arne Vestbø2010-10-211-19/+19
| * | | | Add mkspecs for Clang on Linux and Mac OS XTor Arne Vestbø2010-10-207-0/+291
| * | | | Handle Objective-C/C++ sources in SOURCES gracefullyTor Arne Vestbø2010-10-201-8/+17
* | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2262-604/+461
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-191-1/+1
| |\ \ \ \
| | * \ \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-151-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Added --remove-destination to qmake_emulator_deployment.flmMiikka Heikkinen2010-10-131-1/+1
| | | |/ /
| * | | | mkspecs: Refactor precompiled-header configuration out of gcc-base(-mac)Tor Arne Vestbø2010-10-186-10/+20
| |/ / /
| * | | Refactor GCC mkspecs to share more configuration optionsTor Arne Vestbø2010-10-1351-562/+383
| * | | Merge branch '4.7-s60' into master-s60axis2010-10-083-14/+12
| |\ \ \ | | |/ /
| | * | Fixed some preprocessor parameters for Mac support.axis2010-10-081-4/+4
| | * | Fixed missing QMAKE_MOC definition in certain mkspecs.axis2010-10-082-10/+8
| * | | Align .pro with qmake: s/\.sources/.files/.Miikka Heikkinen2010-10-086-10/+12
| * | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-071-0/+1
| |\ \ \
| | * \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-071-0/+1
| | |\ \ \ | | | |/ /
| | | * | Set reasonable QT_GUI_DRAG_DISTANCE in mkspecs/linux-g++-maemo/qplatformdefs.hMartin Jones2010-10-061-0/+1
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-10-073-21/+41
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Make default application deployment removableMiikka Heikkinen2010-10-073-21/+41
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-071-2/+7
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Fixed library ordering when linking to qtmain.axis2010-10-041-2/+7
* | | | Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-10-221-1/+1
|\ \ \ \
| * | | | Fix QWS generic mac mkspecJørgen Lind2010-10-201-1/+1
| * | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-10-0515-57/+211
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'qt-4.7' into lighthouse-4.7Paul Olav Tvete2010-09-1317-93/+114
| |\ \ \ \
| * \ \ \ \ Merge branch 'qt-4.7' into lighthouse-4.7Paul Olav Tvete2010-08-262-1/+27
| |\ \ \ \ \
* | \ \ \ \ \ Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-055-51/+79
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-042-14/+33
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | / | | |_|_|_|/ | |/| | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-301-2/+22
| | |\ \ \ \
| | | * | | | Added support for unsigned smart installer package creation in SymbianMiikka Heikkinen2010-09-301-2/+22
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-302-10/+9
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Call createpackage without the explicit .bat suffixMartin Storsjo2010-09-281-4/+4
| | | * | | | Improve Qt/Symbian compatibility with unix shellsMartin Storsjo2010-09-281-1/+0
| | | * | | | fix moc argument quoting on mingwOswald Buddenhagen2010-09-281-5/+5
| | * | | | | Streamlined smart installer package creationMiikka Heikkinen2010-09-271-2/+2
| | |/ / / /