Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
6fc00ddc
Commit
6fc00ddc
authored
Jul 12, 2010
by
ck
Browse files
Maemo: Introduce deploy step infrastructure.
Doesn't do anything yet.
parent
f823c481
Changes
11
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
0 → 100644
View file @
6fc00ddc
#include
"maemodeploystep.h"
#include
"maemodeploystepwidget.h"
using
namespace
ProjectExplorer
;
namespace
Qt4ProjectManager
{
namespace
Internal
{
const
QLatin1String
MaemoDeployStep
::
Id
(
"Qt4ProjectManager.MaemoDeployStep"
);
MaemoDeployStep
::
MaemoDeployStep
(
ProjectExplorer
::
BuildConfiguration
*
bc
)
:
BuildStep
(
bc
,
Id
)
{
}
MaemoDeployStep
::
MaemoDeployStep
(
ProjectExplorer
::
BuildConfiguration
*
bc
,
MaemoDeployStep
*
other
)
:
BuildStep
(
bc
,
other
)
{
}
bool
MaemoDeployStep
::
init
()
{
return
true
;
}
void
MaemoDeployStep
::
run
(
QFutureInterface
<
bool
>
&
fi
)
{
fi
.
reportResult
(
true
);
}
BuildStepConfigWidget
*
MaemoDeployStep
::
createConfigWidget
()
{
return
new
MaemoDeployStepWidget
;
}
}
// namespace Internal
}
// namespace Qt4ProjectManager
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.h
0 → 100644
View file @
6fc00ddc
#ifndef MAEMODEPLOYSTEP_H
#define MAEMODEPLOYSTEP_H
#include
<projectexplorer/buildstep.h>
namespace
Qt4ProjectManager
{
namespace
Internal
{
class
MaemoDeployStep
:
public
ProjectExplorer
::
BuildStep
{
Q_OBJECT
friend
class
MaemoDeployStepFactory
;
public:
MaemoDeployStep
(
ProjectExplorer
::
BuildConfiguration
*
bc
);
private:
MaemoDeployStep
(
ProjectExplorer
::
BuildConfiguration
*
bc
,
MaemoDeployStep
*
other
);
virtual
bool
init
();
virtual
void
run
(
QFutureInterface
<
bool
>
&
fi
);
virtual
ProjectExplorer
::
BuildStepConfigWidget
*
createConfigWidget
();
virtual
bool
immutable
()
const
{
return
true
;
}
static
const
QLatin1String
Id
;
};
}
// namespace Internal
}
// namespace Qt4ProjectManager
#endif // MAEMODEPLOYSTEP_H
src/plugins/qt4projectmanager/qt-maemo/maemodeploystepfactory.cpp
0 → 100644
View file @
6fc00ddc
#include
"maemodeploystepfactory.h"
#include
"maemodeploystep.h"
#include
<projectexplorer/buildconfiguration.h>
#include
<projectexplorer/target.h>
#include
<qt4projectmanager/qt4projectmanagerconstants.h>
using
namespace
ProjectExplorer
;
namespace
Qt4ProjectManager
{
namespace
Internal
{
MaemoDeployStepFactory
::
MaemoDeployStepFactory
(
QObject
*
parent
)
:
IBuildStepFactory
(
parent
)
{
}
QStringList
MaemoDeployStepFactory
::
availableCreationIds
(
BuildConfiguration
*
,
BuildStep
::
Type
)
const
{
return
QStringList
();
}
QString
MaemoDeployStepFactory
::
displayNameForId
(
const
QString
&
)
const
{
return
QString
();
}
bool
MaemoDeployStepFactory
::
canCreate
(
BuildConfiguration
*
,
BuildStep
::
Type
,
const
QString
&
)
const
{
return
false
;
}
BuildStep
*
MaemoDeployStepFactory
::
create
(
BuildConfiguration
*
,
BuildStep
::
Type
,
const
QString
&
)
{
Q_ASSERT
(
false
);
return
0
;
}
bool
MaemoDeployStepFactory
::
canRestore
(
BuildConfiguration
*
parent
,
BuildStep
::
Type
type
,
const
QVariantMap
&
map
)
const
{
return
canCreateInternally
(
parent
,
type
,
idFromMap
(
map
));
}
BuildStep
*
MaemoDeployStepFactory
::
restore
(
BuildConfiguration
*
parent
,
BuildStep
::
Type
type
,
const
QVariantMap
&
map
)
{
Q_ASSERT
(
canRestore
(
parent
,
type
,
map
));
MaemoDeployStep
*
const
step
=
new
MaemoDeployStep
(
parent
);
if
(
!
step
->
fromMap
(
map
))
{
delete
step
;
return
0
;
}
return
step
;
}
bool
MaemoDeployStepFactory
::
canClone
(
BuildConfiguration
*
parent
,
BuildStep
::
Type
type
,
BuildStep
*
product
)
const
{
return
canCreateInternally
(
parent
,
type
,
product
->
id
());
}
BuildStep
*
MaemoDeployStepFactory
::
clone
(
BuildConfiguration
*
parent
,
BuildStep
::
Type
type
,
BuildStep
*
product
)
{
Q_ASSERT
(
canClone
(
parent
,
type
,
product
));
return
new
MaemoDeployStep
(
parent
,
static_cast
<
MaemoDeployStep
*>
(
product
));
}
bool
MaemoDeployStepFactory
::
canCreateInternally
(
BuildConfiguration
*
parent
,
BuildStep
::
Type
type
,
const
QString
&
id
)
const
{
return
type
==
BuildStep
::
Deploy
&&
id
==
MaemoDeployStep
::
Id
&&
parent
->
target
()
->
id
()
==
Constants
::
MAEMO_DEVICE_TARGET_ID
;
}
}
// namespace Internal
}
// namespace Qt4ProjectManager
src/plugins/qt4projectmanager/qt-maemo/maemodeploystepfactory.h
0 → 100644
View file @
6fc00ddc
#ifndef MAEMODEPLOYSTEPFACTORY_H
#define MAEMODEPLOYSTEPFACTORY_H
#include
<projectexplorer/buildstep.h>
namespace
Qt4ProjectManager
{
namespace
Internal
{
class
MaemoDeployStepFactory
:
public
ProjectExplorer
::
IBuildStepFactory
{
public:
MaemoDeployStepFactory
(
QObject
*
parent
);
virtual
QStringList
availableCreationIds
(
ProjectExplorer
::
BuildConfiguration
*
parent
,
ProjectExplorer
::
BuildStep
::
Type
type
)
const
;
virtual
QString
displayNameForId
(
const
QString
&
id
)
const
;
virtual
bool
canCreate
(
ProjectExplorer
::
BuildConfiguration
*
parent
,
ProjectExplorer
::
BuildStep
::
Type
type
,
const
QString
&
id
)
const
;
virtual
ProjectExplorer
::
BuildStep
*
create
(
ProjectExplorer
::
BuildConfiguration
*
parent
,
ProjectExplorer
::
BuildStep
::
Type
type
,
const
QString
&
id
);
virtual
bool
canRestore
(
ProjectExplorer
::
BuildConfiguration
*
parent
,
ProjectExplorer
::
BuildStep
::
Type
type
,
const
QVariantMap
&
map
)
const
;
virtual
ProjectExplorer
::
BuildStep
*
restore
(
ProjectExplorer
::
BuildConfiguration
*
parent
,
ProjectExplorer
::
BuildStep
::
Type
type
,
const
QVariantMap
&
map
);
virtual
bool
canClone
(
ProjectExplorer
::
BuildConfiguration
*
parent
,
ProjectExplorer
::
BuildStep
::
Type
type
,
ProjectExplorer
::
BuildStep
*
product
)
const
;
virtual
ProjectExplorer
::
BuildStep
*
clone
(
ProjectExplorer
::
BuildConfiguration
*
parent
,
ProjectExplorer
::
BuildStep
::
Type
type
,
ProjectExplorer
::
BuildStep
*
product
);
private:
bool
canCreateInternally
(
ProjectExplorer
::
BuildConfiguration
*
parent
,
ProjectExplorer
::
BuildStep
::
Type
type
,
const
QString
&
id
)
const
;
};
}
// namespace Internal
}
// namespace Qt4ProjectManager
#endif // MAEMODEPLOYSTEPFACTORY_H
src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
0 → 100644
View file @
6fc00ddc
#include
"maemodeploystepwidget.h"
#include
"ui_maemodeploystepwidget.h"
namespace
Qt4ProjectManager
{
namespace
Internal
{
MaemoDeployStepWidget
::
MaemoDeployStepWidget
()
:
ProjectExplorer
::
BuildStepConfigWidget
(),
ui
(
new
Ui
::
MaemoDeployStepWidget
)
{
ui
->
setupUi
(
this
);
}
MaemoDeployStepWidget
::~
MaemoDeployStepWidget
()
{
delete
ui
;
}
void
MaemoDeployStepWidget
::
init
()
{
}
QString
MaemoDeployStepWidget
::
summaryText
()
const
{
return
tr
(
"<b>Deploy to device</b> "
);
}
QString
MaemoDeployStepWidget
::
displayName
()
const
{
return
QString
();
}
}
// namespace Internal
}
// namespace Qt4ProjectManager
src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.h
0 → 100644
View file @
6fc00ddc
#ifndef MAEMODEPLOYSTEPWIDGET_H
#define MAEMODEPLOYSTEPWIDGET_H
#include
<projectexplorer/buildstep.h>
QT_BEGIN_NAMESPACE
namespace
Ui
{
class
MaemoDeployStepWidget
;
}
QT_END_NAMESPACE
namespace
Qt4ProjectManager
{
namespace
Internal
{
class
MaemoDeployStepWidget
:
public
ProjectExplorer
::
BuildStepConfigWidget
{
Q_OBJECT
public:
MaemoDeployStepWidget
();
~
MaemoDeployStepWidget
();
private:
virtual
void
init
();
virtual
QString
summaryText
()
const
;
virtual
QString
displayName
()
const
;
Ui
::
MaemoDeployStepWidget
*
ui
;
};
}
// namespace Internal
}
// namespace Qt4ProjectManager
#endif // MAEMODEPLOYSTEPWIDGET_H
src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
0 → 100644
View file @
6fc00ddc
<ui version="4.0">
<author/>
<comment/>
<exportmacro/>
<class>MaemoDeployStepWidget</class>
<widget class="QWidget" name="MaemoDeployStepWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
</widget>
<pixmapfunction/>
<connections/>
</ui>
src/plugins/qt4projectmanager/qt-maemo/maemomanager.cpp
View file @
6fc00ddc
...
...
@@ -30,6 +30,7 @@
#include
"maemomanager.h"
#include
"maemoconstants.h"
#include
"maemodeploystepfactory.h"
#include
"maemodeviceconfigurations.h"
#include
"maemopackagecreationfactory.h"
#include
"maemorunfactories.h"
...
...
@@ -57,6 +58,7 @@ MaemoManager::MaemoManager()
,
m_runControlFactory
(
new
MaemoRunControlFactory
(
this
))
,
m_runConfigurationFactory
(
new
MaemoRunConfigurationFactory
(
this
))
,
m_packageCreationFactory
(
new
MaemoPackageCreationFactory
(
this
))
,
m_deployStepFactory
(
new
MaemoDeployStepFactory
(
this
))
,
m_settingsPage
(
new
MaemoSettingsPage
(
this
))
{
Q_ASSERT
(
!
m_instance
);
...
...
@@ -69,6 +71,7 @@ MaemoManager::MaemoManager()
pluginManager
->
addObject
(
m_runControlFactory
);
pluginManager
->
addObject
(
m_runConfigurationFactory
);
pluginManager
->
addObject
(
m_packageCreationFactory
);
pluginManager
->
addObject
(
m_deployStepFactory
);
pluginManager
->
addObject
(
m_settingsPage
);
}
...
...
@@ -77,6 +80,7 @@ MaemoManager::~MaemoManager()
PluginManager
*
pluginManager
=
PluginManager
::
instance
();
pluginManager
->
removeObject
(
m_runControlFactory
);
pluginManager
->
removeObject
(
m_runConfigurationFactory
);
pluginManager
->
removeObject
(
m_deployStepFactory
);
pluginManager
->
removeObject
(
m_packageCreationFactory
);
pluginManager
->
removeObject
(
m_settingsPage
);
...
...
src/plugins/qt4projectmanager/qt-maemo/maemomanager.h
View file @
6fc00ddc
...
...
@@ -41,6 +41,7 @@ namespace Qt4ProjectManager {
class
QtVersion
;
namespace
Internal
{
class
MaemoDeployStepFactory
;
class
MaemoPackageCreationFactory
;
class
MaemoRunControlFactory
;
class
MaemoRunConfigurationFactory
;
...
...
@@ -67,6 +68,7 @@ private:
MaemoRunControlFactory
*
m_runControlFactory
;
MaemoRunConfigurationFactory
*
m_runConfigurationFactory
;
MaemoPackageCreationFactory
*
m_packageCreationFactory
;
MaemoDeployStepFactory
*
m_deployStepFactory
;
MaemoSettingsPage
*
m_settingsPage
;
QemuRuntimeManager
*
m_qemuRuntimeManager
;
};
...
...
src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri
View file @
6fc00ddc
...
...
@@ -19,7 +19,10 @@ HEADERS += \
$$PWD/profilewrapper.h \
$$PWD/maemodeployables.h \
$$PWD/maemodeployable.h \
$$PWD/maemodeployablelistwidget.h
$$PWD/maemodeployablelistwidget.h \
$$PWD/maemodeploystep.h \
$$PWD/maemodeploystepwidget.h \
$$PWD/maemodeploystepfactory.h
SOURCES += \
$$PWD/maemoconfigtestdialog.cpp \
...
...
@@ -40,13 +43,17 @@ SOURCES += \
$$PWD/qemuruntimemanager.cpp \
$$PWD/profilewrapper.cpp \
$$PWD/maemodeployables.cpp \
$$PWD/maemodeployablelistwidget.cpp
$$PWD/maemodeployablelistwidget.cpp \
$$PWD/maemodeploystep.cpp \
$$PWD/maemodeploystepwidget.cpp \
$$PWD/maemodeploystepfactory.cpp
FORMS += \
$$PWD/maemoconfigtestdialog.ui \
$$PWD/maemosettingswidget.ui \
$$PWD/maemosshconfigdialog.ui \
$$PWD/maemopackagecreationwidget.ui \
$$PWD/maemodeployablelistwidget.ui
$$PWD/maemodeployablelistwidget.ui \
qt-maemo/maemodeploystepwidget.ui
RESOURCES += $$PWD/qt-maemo.qrc
src/plugins/qt4projectmanager/qt4target.cpp
View file @
6fc00ddc
...
...
@@ -35,6 +35,7 @@
#include
"qt4project.h"
#include
"qt4runconfiguration.h"
#include
"qt4projectmanagerconstants.h"
#include
"qt-maemo/maemodeploystep.h"
#include
"qt-maemo/maemopackagecreationstep.h"
#include
"qt-maemo/maemorunconfiguration.h"
#include
"qt-s60/s60devicerunconfiguration.h"
...
...
@@ -285,7 +286,10 @@ Qt4BuildConfiguration *Qt4Target::addQt4BuildConfiguration(QString displayName,
S60CreatePackageStep
*
packageStep
=
new
S60CreatePackageStep
(
bc
);
bc
->
insertStep
(
ProjectExplorer
::
BuildStep
::
Deploy
,
2
,
packageStep
);
}
else
if
(
id
()
==
Constants
::
MAEMO_DEVICE_TARGET_ID
)
{
bc
->
insertStep
(
ProjectExplorer
::
BuildStep
::
Deploy
,
2
,
new
MaemoPackageCreationStep
(
bc
));
bc
->
insertStep
(
ProjectExplorer
::
BuildStep
::
Deploy
,
2
,
new
MaemoPackageCreationStep
(
bc
));
// bc->insertStep(ProjectExplorer::BuildStep::Deploy, 2,
// new MaemoDeployStep(bc));
}
MakeStep
*
cleanStep
=
new
MakeStep
(
bc
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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