move MSVC info classes to separate file

Change-Id: I1f10d1eb87ed0fe67cd1b8bc79d8c76d229e98de
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

4 files changed, 52 insertions, 14 deletions

diff --git a/src/app/qbs-setup-toolchains/msvcinfo.h b/src/app/qbs-setup-toolchains/msvcinfo.h
new file mode 100644
index 000000000..7a32af6eb
--- /dev/null
+++ b/src/app/qbs-setup-toolchains/msvcinfo.h
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Build Suite.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#ifndef QBS_MSVCINFO_H
+#define QBS_MSVCINFO_H
+
+#include <QStringList>
+
+class MSVC
+{
+public:
+    QString version;
+    QString installPath;
+    QStringList architectures;
+};
+
+class WinSDK : public MSVC
+{
+public:
+    bool isDefault;
+};
+
+#endif // QBS_MSVCINFO_H
diff --git a/src/app/qbs-setup-toolchains/msvcprobe.cpp b/src/app/qbs-setup-toolchains/msvcprobe.cpp
index fe2ac9bfd..5a0ba4072 100644
--- a/src/app/qbs-setup-toolchains/msvcprobe.cpp
+++ b/src/app/qbs-setup-toolchains/msvcprobe.cpp
@@ -29,6 +29,7 @@
 
 #include "msvcprobe.h"
 
+#include "msvcinfo.h"
 #include "probe.h"
 #include "../shared/logging/consolelogger.h"
 
@@ -46,20 +47,6 @@
 using namespace qbs;
 using Internal::Tr;
 
-class MSVC
-{
-public:
-    QString version;
-    QString installPath;
-    QStringList architectures;
-};
-
-class WinSDK : public MSVC
-{
-public:
-    bool isDefault;
-};
-
 QT_BEGIN_NAMESPACE
 Q_DECLARE_TYPEINFO(WinSDK, Q_MOVABLE_TYPE);
 Q_DECLARE_TYPEINFO(MSVC, Q_MOVABLE_TYPE);
diff --git a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.pro b/src/app/qbs-setup-toolchains/qbs-setup-toolchains.pro
index b00db4614..c113242a6 100644
--- a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.pro
+++ b/src/app/qbs-setup-toolchains/qbs-setup-toolchains.pro
@@ -5,6 +5,7 @@ TARGET = qbs-setup-toolchains
 HEADERS += \
     ../shared/qbssettings.h \
     commandlineparser.h \
+    msvcinfo.h \
     msvcprobe.h \
     probe.h \
     xcodeprobe.h
diff --git a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs b/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs
index d8cf9285e..130978e2f 100644
--- a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs
+++ b/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs
@@ -8,6 +8,7 @@ QbsApp {
         "commandlineparser.cpp",
         "commandlineparser.h",
         "main.cpp",
+        "msvcinfo.h",
         "msvcprobe.cpp",
         "msvcprobe.h",
         "probe.cpp",