diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-04-27 08:45:30 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-04-27 08:45:30 (GMT) |
| commit | 9cea45515ef283c9a870c6f515da50d31addafcf (patch) | |
| tree | d14fdf2b17a2a52c90ac514c39ad60be200cc7d7 /qmake/generators/win32/msvc_vcproj.h | |
| parent | 6749edd4c6f647c4963793183a452bb1ae769c1c (diff) | |
| parent | 13dff164d2ab13b1258d31693b67acebc8636890 (diff) | |
| download | Qt-9cea45515ef283c9a870c6f515da50d31addafcf.zip Qt-9cea45515ef283c9a870c6f515da50d31addafcf.tar.gz Qt-9cea45515ef283c9a870c6f515da50d31addafcf.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'qmake/generators/win32/msvc_vcproj.h')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.h b/qmake/generators/win32/msvc_vcproj.h index ed67ea7..8f028a1 100644 --- a/qmake/generators/win32/msvc_vcproj.h +++ b/qmake/generators/win32/msvc_vcproj.h @@ -61,7 +61,6 @@ class VcprojGenerator : public Win32MakefileGenerator bool writeMakefile(QTextStream &); bool writeProjectMakefile(); - void writeSubDirs(QTextStream &t); QString findTemplate(QString file); void init(); @@ -119,6 +118,9 @@ protected: void initLexYaccFiles(); void initExtraCompilerOutputs(); + void writeSubDirs(QTextStream &t); // Called from VCXProj backend + QUuid getProjectUUID(const QString &filename=QString()); // Called from VCXProj backend + Target projectTarget; // Used for single project @@ -129,7 +131,6 @@ protected: private: QString fixCommandLine(DotNET version, const QString &input) const; - QUuid getProjectUUID(const QString &filename=QString()); QUuid increaseUUID(const QUuid &id); friend class VCFilter; }; |