swh:1:snp:673156c31a876c5b99b2fe3e89615529de9a3c44
Tip revision: ca572c0b806388cbc58dcba4ab6d7cc25d89366a authored by Simo Fält on 29 March 2012, 10:35:50 UTC
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase
Tip revision: ca572c0
| File | Mode | Size |
|---|---|---|
| generators | ||
| CHANGES | -rw-r--r-- | 3.2 KB |
| Makefile.unix | -rw-r--r-- | 14.8 KB |
| Makefile.win32 | -rw-r--r-- | 5.1 KB |
| Makefile.win32-g++ | -rw-r--r-- | 3.9 KB |
| cachekeys.h | -rw-r--r-- | 4.2 KB |
| main.cpp | -rw-r--r-- | 7.2 KB |
| meta.cpp | -rw-r--r-- | 7.3 KB |
| meta.h | -rw-r--r-- | 3.1 KB |
| option.cpp | -rw-r--r-- | 33.5 KB |
| option.h | -rw-r--r-- | 7.3 KB |
| project.cpp | -rw-r--r-- | 118.9 KB |
| project.h | -rw-r--r-- | 7.0 KB |
| property.cpp | -rw-r--r-- | 8.8 KB |
| property.h | -rw-r--r-- | 2.2 KB |
| qmake.pri | -rw-r--r-- | 4.4 KB |
| qmake.pro | -rw-r--r-- | 1.2 KB |
| qmake_pch.h | -rw-r--r-- | 2.1 KB |
