Commit 6aa615db authored by Kai Koehne's avatar Kai Koehne
Browse files

Export S60DeployConfiguration class

Allow the class to be used in QmlProfiler

Change-Id: I11e5bad9a836a0589f1cded431844c9cd8185e22
Reviewed-on: http://codereview.qt.nokia.com/426

Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
Reviewed-by: default avatarPaweł Polański <jaggernod@gmail.com>
parent e1448381
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#define S60DEPLOYCONFIGURATION_H #define S60DEPLOYCONFIGURATION_H
#include <projectexplorer/deployconfiguration.h> #include <projectexplorer/deployconfiguration.h>
#include <qt4projectmanager/qt4projectmanager_global.h>
namespace ProjectExplorer { namespace ProjectExplorer {
class BuildConfiguration; class BuildConfiguration;
...@@ -47,13 +48,13 @@ class BaseQtVersion; ...@@ -47,13 +48,13 @@ class BaseQtVersion;
namespace Qt4ProjectManager { namespace Qt4ProjectManager {
class Qt4ProFileNode; class Qt4ProFileNode;
class S60DeviceRunConfiguration; class S60DeployConfigurationFactory;
namespace Internal { namespace Internal {
class Qt4SymbianTarget; class Qt4SymbianTarget;
class S60DeployConfigurationFactory; }
class S60DeployConfiguration : public ProjectExplorer::DeployConfiguration class QT4PROJECTMANAGER_EXPORT S60DeployConfiguration : public ProjectExplorer::DeployConfiguration
{ {
Q_OBJECT Q_OBJECT
friend class S60DeployConfigurationFactory; friend class S60DeployConfigurationFactory;
...@@ -73,7 +74,6 @@ public: ...@@ -73,7 +74,6 @@ public:
ProjectExplorer::DeployConfigurationWidget *configurationWidget() const; ProjectExplorer::DeployConfigurationWidget *configurationWidget() const;
const QtSupport::BaseQtVersion *qtVersion() const; const QtSupport::BaseQtVersion *qtVersion() const;
Qt4SymbianTarget *qt4Target() const;
ProjectExplorer::ToolChain *toolChain() const; ProjectExplorer::ToolChain *toolChain() const;
QString serialPortName() const; QString serialPortName() const;
...@@ -133,6 +133,7 @@ private: ...@@ -133,6 +133,7 @@ private:
bool isStaticLibrary(const Qt4ProFileNode &projectNode) const; bool isStaticLibrary(const Qt4ProFileNode &projectNode) const;
bool isApplication(const Qt4ProFileNode &projectNode) const; bool isApplication(const Qt4ProFileNode &projectNode) const;
bool hasSisPackage(const Qt4ProFileNode &projectNode) const; bool hasSisPackage(const Qt4ProFileNode &projectNode) const;
Internal::Qt4SymbianTarget *qt4Target() const;
private: private:
ProjectExplorer::BuildConfiguration *m_activeBuildConfiguration; ProjectExplorer::BuildConfiguration *m_activeBuildConfiguration;
...@@ -167,7 +168,6 @@ public: ...@@ -167,7 +168,6 @@ public:
QString displayNameForId(const QString &id) const; QString displayNameForId(const QString &id) const;
}; };
} // namespace Internal
} // namespace Qt4ProjectManager } // namespace Qt4ProjectManager
#endif // S60DEPLOYCONFIGURATION_H #endif // S60DEPLOYCONFIGURATION_H
...@@ -67,10 +67,11 @@ namespace Coda { ...@@ -67,10 +67,11 @@ namespace Coda {
} }
namespace Qt4ProjectManager { namespace Qt4ProjectManager {
namespace Internal {
class S60DeployConfiguration; class S60DeployConfiguration;
namespace Internal {
/* Configuration widget for S60 devices on serial ports that are /* Configuration widget for S60 devices on serial ports that are
* provided by the SerialDeviceLister class. Has an info/test * provided by the SerialDeviceLister class. Has an info/test
* button connecting to the device and showing info. */ * button connecting to the device and showing info. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment