summaryrefslogtreecommitdiffstats
path: root/src/tools/moc/moc.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-23 14:35:57 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-23 14:35:57 (GMT)
commit955189bf5ee3a00a82b016870a6d704be03d6934 (patch)
treef727585af05b4482864d9c9b126ed16f1cb0d7e4 /src/tools/moc/moc.cpp
parent6fc62c47739cedb5f3bc8de3004f68b62de991f2 (diff)
parent10e69e1d5069efa24dd70ef3fb5f9ef827ff9a4a (diff)
downloadQt-955189bf5ee3a00a82b016870a6d704be03d6934.zip
Qt-955189bf5ee3a00a82b016870a6d704be03d6934.tar.gz
Qt-955189bf5ee3a00a82b016870a6d704be03d6934.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Namespace compile fix for 00e954ca817f89958a8a8777d93d3843252dc88c Qt Designer/Integrations: Add properties for use by C++-IDEs.
Diffstat (limited to 'src/tools/moc/moc.cpp')
0 files changed, 0 insertions, 0 deletions