diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-11 10:36:46 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-11 10:36:46 (GMT) |
| commit | 86b43e8186055ea232ae94e708d3cd381fa179df (patch) | |
| tree | 8e20492c61a3925248c18e98bb229821dbf9f246 /src/plugins/platforms/wayland/qwaylandintegration.h | |
| parent | 1a742a039802b32cfe2a92d8ef1a04c3a21a964f (diff) | |
| parent | fab911a64a72d5b7f450f3f3616e38c96d601553 (diff) | |
| download | Qt-86b43e8186055ea232ae94e708d3cd381fa179df.zip Qt-86b43e8186055ea232ae94e708d3cd381fa179df.tar.gz Qt-86b43e8186055ea232ae94e708d3cd381fa179df.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:
fixup for 23e772584531278e3b2a6c735ff9db88f7ffd76e
qmake vc(x)proj generator: support x64 Qt builds
qmake: remove dead code from VcxprojGenerator
qmake nmake generator: pass MAKEFLAGS to sub-make calls
Diffstat (limited to 'src/plugins/platforms/wayland/qwaylandintegration.h')
0 files changed, 0 insertions, 0 deletions