summaryrefslogtreecommitdiff
path: root/src/plugins/qt4projectmanager/qt-s60
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2011-06-09 12:52:38 +0200
committerKai Koehne <kai.koehne@nokia.com>2011-06-10 14:34:01 +0200
commit6aa615db5235a2555b236909fa03204895912600 (patch)
tree584526c4199a84f95a0762d2a43a5bfbe09cfe53 /src/plugins/qt4projectmanager/qt-s60
parente1448381bc171bae1cc1e261545f352b1c4ec05e (diff)
downloadqt-creator-6aa615db5235a2555b236909fa03204895912600.tar.gz
Export S60DeployConfiguration class
Allow the class to be used in QmlProfiler Change-Id: I11e5bad9a836a0589f1cded431844c9cd8185e22 Reviewed-on: http://codereview.qt.nokia.com/426 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Paweł Polański <jaggernod@gmail.com>
Diffstat (limited to 'src/plugins/qt4projectmanager/qt-s60')
-rw-r--r--src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.h10
-rw-r--r--src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.h3
2 files changed, 7 insertions, 6 deletions
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.h
index d8caddd291..0c313009e7 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.h
@@ -34,6 +34,7 @@
#define S60DEPLOYCONFIGURATION_H
#include <projectexplorer/deployconfiguration.h>
+#include <qt4projectmanager/qt4projectmanager_global.h>
namespace ProjectExplorer {
class BuildConfiguration;
@@ -47,13 +48,13 @@ class BaseQtVersion;
namespace Qt4ProjectManager {
class Qt4ProFileNode;
-class S60DeviceRunConfiguration;
+class S60DeployConfigurationFactory;
namespace Internal {
class Qt4SymbianTarget;
-class S60DeployConfigurationFactory;
+}
-class S60DeployConfiguration : public ProjectExplorer::DeployConfiguration
+class QT4PROJECTMANAGER_EXPORT S60DeployConfiguration : public ProjectExplorer::DeployConfiguration
{
Q_OBJECT
friend class S60DeployConfigurationFactory;
@@ -73,7 +74,6 @@ public:
ProjectExplorer::DeployConfigurationWidget *configurationWidget() const;
const QtSupport::BaseQtVersion *qtVersion() const;
- Qt4SymbianTarget *qt4Target() const;
ProjectExplorer::ToolChain *toolChain() const;
QString serialPortName() const;
@@ -133,6 +133,7 @@ private:
bool isStaticLibrary(const Qt4ProFileNode &projectNode) const;
bool isApplication(const Qt4ProFileNode &projectNode) const;
bool hasSisPackage(const Qt4ProFileNode &projectNode) const;
+ Internal::Qt4SymbianTarget *qt4Target() const;
private:
ProjectExplorer::BuildConfiguration *m_activeBuildConfiguration;
@@ -167,7 +168,6 @@ public:
QString displayNameForId(const QString &id) const;
};
-} // namespace Internal
} // namespace Qt4ProjectManager
#endif // S60DEPLOYCONFIGURATION_H
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.h b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.h
index 4c03a9a6f0..6348176fa9 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.h
@@ -67,10 +67,11 @@ namespace Coda {
}
namespace Qt4ProjectManager {
-namespace Internal {
class S60DeployConfiguration;
+namespace Internal {
+
/* Configuration widget for S60 devices on serial ports that are
* provided by the SerialDeviceLister class. Has an info/test
* button connecting to the device and showing info. */