summaryrefslogtreecommitdiffstats
path: root/qmake/Makefile.unix
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Kent Hansen2009-08-181-4/+4
|\ | | | | | | | | | | | | | | | | | | qtscript-jsc-backend Conflicts: src/script/qscriptclass.cpp src/script/qscriptcontext.cpp src/script/qscriptengine.cpp src/script/qscriptvalue.cpp
| * CompileAnders Bakken2009-08-171-4/+4
| | | | | | | | | | | | | | After 843d2eed0ac10589a01d40bfdf88cb44c6a00b17 qmake didn't compile anymore. Reviewed-by: TrustMe
* | Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backendKent Hansen2009-07-281-1/+8
|\ \ | |/ | | | | | | | | | | Conflicts: src/corelib/tools/qregexp.cpp src/script/qscriptengine.cpp src/script/qscriptvalue.cpp
| * Changed the implementation of the unicode text codecs to share more code ↵Denis Dzyubenko2009-07-161-1/+8
| | | | | | | | | | | | | | | | | | | | with qstring. The qstring unicode conversion functions used to have its own implementation, which did the same as QUtf*Codecs, so with the change all of them will share the same implementation. Reviewed-by: Thiago Macieira
* | Import JSC-based Qt Script from Kent's tree.Simon Hausmann2009-06-161-149/+0
|/
* Long live Qt!Lars Knoll2009-03-231-0/+416