diff options
| author | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-05-13 11:30:46 (GMT) |
|---|---|---|
| committer | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-05-13 11:30:46 (GMT) |
| commit | 50ea2454c0ad9b28be6dd5125c74466f0f96d16a (patch) | |
| tree | 610e8b4852bca7d23ec5c4b9937a119eed96a124 /qmake/generators/win32/msvc_vcxproj.h | |
| parent | 0f750aec4507fffc06acea46a513c6d374564d6a (diff) | |
| parent | a80130b07c5b8ee4b06eabbceb65eb23d4d4602e (diff) | |
| download | Qt-50ea2454c0ad9b28be6dd5125c74466f0f96d16a.zip Qt-50ea2454c0ad9b28be6dd5125c74466f0f96d16a.tar.gz Qt-50ea2454c0ad9b28be6dd5125c74466f0f96d16a.tar.bz2 | |
Merge remote-tracking branch 'qt/4.8'
Conflicts:
src/s60installs/eabi/QtOpenGLu.def
Diffstat (limited to 'qmake/generators/win32/msvc_vcxproj.h')
| -rw-r--r-- | qmake/generators/win32/msvc_vcxproj.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/qmake/generators/win32/msvc_vcxproj.h b/qmake/generators/win32/msvc_vcxproj.h index 3283cc7..90f6652 100644 --- a/qmake/generators/win32/msvc_vcxproj.h +++ b/qmake/generators/win32/msvc_vcxproj.h @@ -42,8 +42,6 @@ #ifndef MSVC_VCXPROJ_H #define MSVC_VCXPROJ_H -#include "winmakefile.h" -#include "msbuild_objectmodel.h" #include "msvc_vcproj.h" QT_BEGIN_NAMESPACE @@ -52,19 +50,11 @@ class VcxprojGenerator : public VcprojGenerator { public: VcxprojGenerator(); - ~VcxprojGenerator(); protected: virtual VCProjectWriter *createProjectWriter(); - -private: - friend class VCFilter; - }; -inline VcxprojGenerator::~VcxprojGenerator() -{ } - QT_END_NAMESPACE #endif // MSVC_VCXPROJ_H |