diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-15 21:18:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-15 21:18:11 (GMT) |
| commit | 596c8c65524d27b2537986b94c19d796219217b9 (patch) | |
| tree | 1ed4b329861b1f5384116714a6af3c6140dcbf49 /src/gui/egl | |
| parent | c0cd8db0498daaa8151d1f80143b6849016bdc7c (diff) | |
| parent | 29b596c647d2339496458231e8eec6c63ccf4641 (diff) | |
| download | Qt-596c8c65524d27b2537986b94c19d796219217b9.zip Qt-596c8c65524d27b2537986b94c19d796219217b9.tar.gz Qt-596c8c65524d27b2537986b94c19d796219217b9.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
Revert "qmake vcproj generator: do not insert $(INHERIT)"
qmake vcproj generator: do not insert $(INHERIT)
qmake/Mac: replace @SHORT_VERSION@ in QMAKE_INFO_PLIST file not only for libs
qmake nmake / mingw32-make generators: fix DEF_FILE for shadow builds
qmake: fix the language settings generated Windows resource files
qmake vc(x)proj generator: fix handling of DEFINES from .prl files
qmake vc(x)proj generator: set the output directory
qmake vc(x)proj generator: fix reading of /YX, /Yc, /Yu compiler flags
qmake vcproj generator: support PCHs with other extensions than .h
Diffstat (limited to 'src/gui/egl')
0 files changed, 0 insertions, 0 deletions