diff options
author | Geir Vattekar <geir.vattekar@nokia.com> | 2010-10-08 07:21:51 (GMT) |
---|---|---|
committer | Geir Vattekar <geir.vattekar@nokia.com> | 2010-10-08 07:21:51 (GMT) |
commit | 904b56a9cc810b340d1b7db81199fc0e15b4aab6 (patch) | |
tree | 5792edd70546f6500210164327d0014f147d1ffe /qmake/generators/win32/msbuild_objectmodel.h | |
parent | 91396846206e6b41d32fa8a30888261581bd28dc (diff) | |
parent | 8130fcbffe365c0e019f45baae7f1b273d8e17e7 (diff) | |
download | Qt-904b56a9cc810b340d1b7db81199fc0e15b4aab6.zip Qt-904b56a9cc810b340d1b7db81199fc0e15b4aab6.tar.gz Qt-904b56a9cc810b340d1b7db81199fc0e15b4aab6.tar.bz2 |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'qmake/generators/win32/msbuild_objectmodel.h')
-rw-r--r-- | qmake/generators/win32/msbuild_objectmodel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/win32/msbuild_objectmodel.h b/qmake/generators/win32/msbuild_objectmodel.h index 567985d..acca6c1 100644 --- a/qmake/generators/win32/msbuild_objectmodel.h +++ b/qmake/generators/win32/msbuild_objectmodel.h @@ -382,7 +382,7 @@ protected: public: // Variables - QString CommandLine; + QStringList CommandLine; QString Description; triState UseInBuild; QString EventName; |