diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-04-23 00:26:25 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-04-23 00:26:25 (GMT) |
| commit | af9fa6d83b30fb6434eefc478ab97c67c8e6ede4 (patch) | |
| tree | 9fbfdfd05edbb9363aa738c545140d53323f0b8f /qmake/generators/win32/msvc_vcproj.h | |
| parent | 478e914638f2131d1547c4e2dc4659723657194d (diff) | |
| parent | dea1e487b62bab557111e75bd1f534f16e9ca763 (diff) | |
| download | Qt-af9fa6d83b30fb6434eefc478ab97c67c8e6ede4.zip Qt-af9fa6d83b30fb6434eefc478ab97c67c8e6ede4.tar.gz Qt-af9fa6d83b30fb6434eefc478ab97c67c8e6ede4.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging 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; }; |