forked from qt-creator/qt-creator
		
	S60: Use a DetailsWidget for the run configuration widgets, add info
- Move the s60devicerunconfigurationwidget into a separate file, add an info button that connects to the device and displays CPU/Trk version for testing the connection. - give TrkLauncher a parent object and an acessor for the device description in formatted form. - Break deadlock when trying to terminate the Windows Trk writer thread with bytes pending by using a wait with timeout and termination flag.
This commit is contained in:
		| @@ -34,8 +34,15 @@ | ||||
| #include <projectexplorer/applicationlauncher.h> | ||||
|  | ||||
| #include <QtGui/QWidget> | ||||
| #include <QtGui/QLabel> | ||||
| #include <QtGui/QLineEdit> | ||||
|  | ||||
| QT_BEGIN_NAMESPACE | ||||
| class QLabel; | ||||
| class QLineEdit; | ||||
| QT_END_NAMESPACE | ||||
|  | ||||
| namespace Utils { | ||||
|     class DetailsWidget; | ||||
| } | ||||
|  | ||||
| namespace Qt4ProjectManager { | ||||
| namespace Internal { | ||||
| @@ -79,9 +86,11 @@ public: | ||||
| private slots: | ||||
|     void nameEdited(const QString &text); | ||||
|     void updateTargetInformation(); | ||||
|     void updateSummary(); | ||||
|  | ||||
| private: | ||||
|     S60EmulatorRunConfiguration *m_runConfiguration; | ||||
|     Utils::DetailsWidget *m_detailsWidget; | ||||
|     QLineEdit *m_nameLineEdit; | ||||
|     QLabel *m_executableLabel; | ||||
| }; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user