From ede672c8d9a997d8bb395d18c0eb829d99a56f16 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu, 18 Aug 2011 16:55:45 +0200
Subject: [PATCH] Compile fix Windows.
Change-Id: Ia9f9afaf77c000503512a19ef7e4f33ae9cca041
Reviewed-on: http://codereview.qt.nokia.com/3217
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---
src/plugins/qt4projectmanager/qt4project.cpp | 5 +++--
src/plugins/qt4projectmanager/qt4project.h | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 625c6091322..f1d00e163d8 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -234,7 +234,7 @@ void ProjectFilesVisitor::visitFolderNode(FolderNode *folderNode)
}
// ----------- Qt4ProjectFile
-
+namespace Internal {
Qt4ProjectFile::Qt4ProjectFile(Qt4Project *project, const QString &filePath, QObject *parent)
: Core::IFile(parent),
m_mimeType(QLatin1String(Qt4ProjectManager::Constants::PROFILE_MIMETYPE)),
@@ -308,7 +308,6 @@ bool Qt4ProjectFile::reload(QString *errorString, ReloadFlag flag, ChangeType ty
}
} // namespace Internal
-
/*!
\class Qt4Project
@@ -1343,4 +1342,6 @@ void CentralizedFolderWatcher::delayedFolderChanged(const QString &folder)
// }
//}
+} // namespace Qt4ProjectManager
+
#include "qt4project.moc"
diff --git a/src/plugins/qt4projectmanager/qt4project.h b/src/plugins/qt4projectmanager/qt4project.h
index 34af88d8da8..04de94a5d1a 100644
--- a/src/plugins/qt4projectmanager/qt4project.h
+++ b/src/plugins/qt4projectmanager/qt4project.h
@@ -205,7 +205,7 @@ private:
Internal::CentralizedFolderWatcher *m_centralizedFolderWatcher;
- friend class Qt4ProjectFile;
+ friend class Internal::Qt4ProjectFile;
friend class Internal::Qt4ProjectConfigWidget;
};
--
GitLab