Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

2009-01-20 11:54:28 +01:00
parent f6b0820315 44ed62c181
commit 67437acf49
7 changed files with 68 additions and 24 deletions
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
@@ -48,6 +48,7 @@
 #include "profilereader.h"
 #include "gdbmacrosbuildstep.h"

+#include <extensionsystem/pluginmanager.h>
 #include <projectexplorer/buildmanager.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
@@ -64,7 +65,6 @@

 #ifdef WITH_TESTS
 #include <QTest>
-#include <extensionsystem/pluginmanager.h>
 #endif

 using namespace Qt4ProjectManager::Internal;