Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
flatpak-qt-creator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
20e749df
Commit
20e749df
authored
Nov 30, 2010
by
Christian Kandeler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Maemo: Move "mad info" parsing for Qemu specs into dedicated classes.
parent
0f15f419
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
454 additions
and
319 deletions
+454
-319
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
+17
-0
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
+2
-0
src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp
src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp
+4
-298
src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.h
src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.h
+0
-19
src/plugins/qt4projectmanager/qt-maemo/maemoqemuruntimeparser.cpp
...ins/qt4projectmanager/qt-maemo/maemoqemuruntimeparser.cpp
+367
-0
src/plugins/qt4projectmanager/qt-maemo/maemoqemuruntimeparser.h
...ugins/qt4projectmanager/qt-maemo/maemoqemuruntimeparser.h
+60
-0
src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri
src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri
+4
-2
No files found.
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
View file @
20e749df
...
...
@@ -29,6 +29,7 @@
#include "maemoglobal.h"
#include "maemoconstants.h"
#include "maemodeviceconfigurations.h"
#include <coreplugin/ssh/sshconnection.h>
...
...
@@ -44,6 +45,9 @@
namespace
Qt4ProjectManager
{
namespace
Internal
{
namespace
{
static
const
QLatin1String
binQmake
(
"/bin/qmake"
EXEC_SUFFIX
);
}
QString
MaemoGlobal
::
homeDirOnDevice
(
const
QString
&
uname
)
{
...
...
@@ -99,6 +103,19 @@ QString MaemoGlobal::failedToConnectToServerMessage(const Core::SshConnection::P
return
errorMsg
;
}
QString
MaemoGlobal
::
maddeRoot
(
const
QString
&
qmakePath
)
{
QDir
dir
(
QDir
::
cleanPath
(
qmakePath
).
remove
(
binQmake
));
dir
.
cdUp
();
dir
.
cdUp
();
return
dir
.
absolutePath
();
}
QString
MaemoGlobal
::
targetName
(
const
QString
&
qmakePath
)
{
const
QString
target
=
QDir
::
cleanPath
(
qmakePath
).
remove
(
binQmake
);
return
target
.
mid
(
target
.
lastIndexOf
(
QLatin1Char
(
'/'
))
+
1
);
}
bool
MaemoGlobal
::
removeRecursively
(
const
QString
&
filePath
,
QString
&
error
)
{
QFileInfo
fileInfo
(
filePath
);
...
...
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
View file @
20e749df
...
...
@@ -63,6 +63,8 @@ public:
static
QString
remoteSourceProfilesCommand
();
static
QString
failedToConnectToServerMessage
(
const
QSharedPointer
<
Core
::
SshConnection
>
&
connection
,
const
MaemoDeviceConfig
&
deviceConfig
);
static
QString
maddeRoot
(
const
QString
&
qmakePath
);
static
QString
targetName
(
const
QString
&
qmakePath
);
static
bool
removeRecursively
(
const
QString
&
filePath
,
QString
&
error
);
static
void
callMaddeShellScript
(
QProcess
&
proc
,
const
QString
&
maddeRoot
,
...
...
src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp
View file @
20e749df
This diff is collapsed.
Click to expand it.
src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.h
View file @
20e749df
...
...
@@ -42,7 +42,6 @@
QT_FORWARD_DECLARE_CLASS
(
QAction
);
QT_FORWARD_DECLARE_CLASS
(
QFileSystemWatcher
)
QT_FORWARD_DECLARE_CLASS
(
QStringList
);
QT_FORWARD_DECLARE_CLASS
(
QXmlStreamReader
);
namespace
ProjectExplorer
{
class
BuildConfiguration
;
...
...
@@ -113,24 +112,6 @@ private:
bool
targetUsesMatchingRuntimeConfig
(
ProjectExplorer
::
Target
*
target
,
QtVersion
**
qtVersion
=
0
);
QString
maddeRoot
(
const
QString
&
qmake
)
const
;
QString
targetRoot
(
const
QString
&
qmake
)
const
;
bool
fillRuntimeInformationForOldMadInfo
(
MaemoQemuRuntime
*
runtime
)
const
;
void
setEnvironment
(
MaemoQemuRuntime
*
runTime
,
const
QString
&
envSpec
)
const
;
MaemoQemuRuntime
createRuntime
(
const
QtVersion
*
qtVersion
)
const
;
MaemoQemuRuntime
parseRuntimeFromMadInfo
(
const
QByteArray
&
output
,
const
QString
&
targetName
)
const
;
MaemoQemuRuntime
parseRuntimeFromOldMadInfo
(
const
QString
&
output
,
const
QString
&
maddeRootPath
,
const
QString
&
targetName
)
const
;
void
handleMadInfoTargetTag
(
QXmlStreamReader
&
infoReader
,
QString
&
runtimeName
,
const
QString
&
targetName
)
const
;
MaemoQemuRuntime
handleMadInfoRuntimeTag
(
QXmlStreamReader
&
infoReader
)
const
;
QHash
<
QString
,
QString
>
handleMadInfoEnvironmentTag
(
QXmlStreamReader
&
infoReader
)
const
;
QPair
<
QString
,
QString
>
handleMadInfoVariableTag
(
QXmlStreamReader
&
infoReader
)
const
;
MaemoPortList
handleMadInfoTcpPortListTag
(
QXmlStreamReader
&
infoReader
)
const
;
int
handleMadInfoPortTag
(
QXmlStreamReader
&
infoReader
)
const
;
void
notify
(
const
QList
<
int
>
uniqueIds
);
void
toggleDeviceConnections
(
MaemoRunConfiguration
*
mrc
,
bool
connect
);
...
...
src/plugins/qt4projectmanager/qt-maemo/maemoqemuruntimeparser.cpp
0 → 100644
View file @
20e749df
This diff is collapsed.
Click to expand it.
src/plugins/qt4projectmanager/qt-maemo/maemoqemuruntimeparser.h
0 → 100644
View file @
20e749df
/**************************************************************************
**
** 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 MAEMOQEMURUNTIMEPARSER_H
#define MAEMOQEMURUNTIMEPARSER_H
#include "maemoqemuruntime.h"
#include <QtCore/QString>
#include <QtXml/QXmlStreamReader>
namespace
Qt4ProjectManager
{
class
QtVersion
;
namespace
Internal
{
class
MaemoQemuRuntimeParser
{
public:
static
MaemoQemuRuntime
parseRuntime
(
const
QtVersion
*
qtVersion
);
protected:
MaemoQemuRuntimeParser
(
const
QString
&
madInfoOutput
,
const
QString
&
targetName
);
const
QString
&
targetName
()
const
{
return
m_targetName
;
}
QXmlStreamReader
m_madInfoReader
;
private:
const
QString
m_targetName
;
};
}
// namespace Internal
}
// namespace Qt4ProjectManager
#endif // MAEMOQEMURUNTIMEPARSER_H
src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri
View file @
20e749df
...
...
@@ -42,7 +42,8 @@ HEADERS += \
$$PWD/maemopublishingwizardfremantlefree.h \
$$PWD/maemopublishingresultpagefremantlefree.h \
$$PWD/maemopublisherfremantlefree.h \
$$PWD/maemoqemuruntime.h
$$PWD/maemoqemuruntime.h \
qt-maemo/maemoqemuruntimeparser.h
SOURCES += \
$$PWD/maemoconfigtestdialog.cpp \
...
...
@@ -85,7 +86,8 @@ SOURCES += \
$$PWD/maemopublishinguploadsettingspagefremantlefree.cpp \
$$PWD/maemopublishingwizardfremantlefree.cpp \
$$PWD/maemopublishingresultpagefremantlefree.cpp \
$$PWD/maemopublisherfremantlefree.cpp
$$PWD/maemopublisherfremantlefree.cpp \
qt-maemo/maemoqemuruntimeparser.cpp
FORMS += \
$$PWD/maemoconfigtestdialog.ui \
...
...
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