Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
0f15f419
Commit
0f15f419
authored
Nov 30, 2010
by
Christian Kandeler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Maemo: Move MaemoQemuRuntime class to its own file.
parent
9a266548
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
73 additions
and
30 deletions
+73
-30
src/plugins/qt4projectmanager/qt-maemo/maemoconstants.h
src/plugins/qt4projectmanager/qt-maemo/maemoconstants.h
+0
-8
src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.h
src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.h
+2
-21
src/plugins/qt4projectmanager/qt-maemo/maemoqemuruntime.h
src/plugins/qt4projectmanager/qt-maemo/maemoqemuruntime.h
+69
-0
src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri
src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri
+2
-1
No files found.
src/plugins/qt4projectmanager/qt-maemo/maemoconstants.h
View file @
0f15f419
...
...
@@ -39,14 +39,6 @@
namespace
Qt4ProjectManager
{
namespace
Internal
{
enum
QemuStatus
{
QemuStarting
,
QemuFailedToStart
,
QemuFinished
,
QemuCrashed
,
QemuUserReason
};
#define PREFIX "Qt4ProjectManager.MaemoRunConfiguration"
#ifdef Q_OS_WIN32
...
...
src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.h
View file @
0f15f419
...
...
@@ -31,9 +31,8 @@
#define QEMURUNTIMEMANAGER_H
#include "maemoconstants.h"
#include "maemo
deviceconfigurations
.h"
#include "maemo
qemuruntime
.h"
#include <QtCore/QHash>
#include <QtCore/QMap>
#include <QtCore/QObject>
#include <QtCore/QProcess>
...
...
@@ -57,24 +56,6 @@ namespace Qt4ProjectManager {
namespace
Internal
{
class
MaemoRunConfiguration
;
struct
MaemoQemuRuntime
{
MaemoQemuRuntime
()
{}
MaemoQemuRuntime
(
const
QString
&
root
)
:
m_root
(
root
)
{}
bool
isValid
()
const
{
return
!
m_bin
.
isEmpty
();
}
QString
m_name
;
QString
m_bin
;
QString
m_root
;
QString
m_args
;
QString
m_sshPort
;
QString
m_watchPath
;
QHash
<
QString
,
QString
>
m_environment
;
MaemoPortList
m_freePorts
;
};
class
MaemoQemuManager
:
public
QObject
{
...
...
@@ -166,7 +147,7 @@ private:
QFileSystemWatcher
*
m_runtimeFolderWatcher
;
};
}
// namespace Qt4ProjectManager
}
// namespace Internal
}
// namespace Qt4ProjectManager
#endif // QEMURUNTIMEMANAGER_H
src/plugins/qt4projectmanager/qt-maemo/maemoqemuruntime.h
0 → 100644
View file @
0f15f419
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** Commercial Usage
**
** Licensees holding valid Qt Commercial licenses may use this file in
** accordance with the Qt Commercial License Agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Nokia.
**
** 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.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
**
**************************************************************************/
#ifndef MAEMOQEMURUNTIME_H
#define MAEMOQEMURUNTIME_H
#include "maemodeviceconfigurations.h"
#include <QtCore/QHash>
#include <QtCore/QString>
namespace
Qt4ProjectManager
{
namespace
Internal
{
enum
QemuStatus
{
QemuStarting
,
QemuFailedToStart
,
QemuFinished
,
QemuCrashed
,
QemuUserReason
};
struct
MaemoQemuRuntime
{
MaemoQemuRuntime
()
{}
MaemoQemuRuntime
(
const
QString
&
root
)
:
m_root
(
root
)
{}
bool
isValid
()
const
{
return
!
m_bin
.
isEmpty
();
}
QString
m_name
;
QString
m_bin
;
QString
m_root
;
QString
m_args
;
QString
m_sshPort
;
QString
m_watchPath
;
QHash
<
QString
,
QString
>
m_environment
;
MaemoPortList
m_freePorts
;
};
}
// namespace Internal
}
// namespace Qt4ProjectManager
#endif // MAEMOQEMURUNTIME_H
src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri
View file @
0f15f419
...
...
@@ -41,7 +41,8 @@ HEADERS += \
$$PWD/maemopublishinguploadsettingspagefremantlefree.h \
$$PWD/maemopublishingwizardfremantlefree.h \
$$PWD/maemopublishingresultpagefremantlefree.h \
$$PWD/maemopublisherfremantlefree.h
$$PWD/maemopublisherfremantlefree.h \
$$PWD/maemoqemuruntime.h
SOURCES += \
$$PWD/maemoconfigtestdialog.cpp \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment