Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
qt-creator
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Tobias Hunger
qt-creator
Commits
9abcd93c
Commit
9abcd93c
authored
15 years ago
by
Daniel Molkentin
Browse files
Options
Downloads
Patches
Plain Diff
QtS60 Run Configuration: Proper slashes for path
Reviewed-By: con
parent
07a5604a
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp
+6
-3
6 additions, 3 deletions
...projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp
with
6 additions
and
3 deletions
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp
+
6
−
3
View file @
9abcd93c
...
...
@@ -42,6 +42,7 @@
#include
<utils/pathchooser.h>
#include
<QtCore/QTimer>
#include
<QtCore/QDir>
#include
<QtGui/QRadioButton>
#include
<QtGui/QLabel>
#include
<QtGui/QLineEdit>
...
...
@@ -67,12 +68,13 @@ S60DeviceRunConfigurationWidget::S60DeviceRunConfigurationWidget(
m_detailsWidget
(
new
Utils
::
DetailsWidget
),
m_serialPortsCombo
(
new
QComboBox
),
m_nameLineEdit
(
new
QLineEdit
(
m_runConfiguration
->
name
())),
m_sisxFileLabel
(
new
QLabel
(
m_runConfiguration
->
basePackageFilePath
()
+
QLatin1String
(
".sisx"
))
),
m_sisxFileLabel
(
new
QLabel
),
m_deviceInfoButton
(
new
QToolButton
),
m_deviceInfoDescriptionLabel
(
new
QLabel
(
tr
(
"Device:"
))),
m_deviceInfoLabel
(
new
QLabel
),
m_infoTimeOutTimer
(
0
)
{
updateTargetInformation
();
QVBoxLayout
*
mainBoxLayout
=
new
QVBoxLayout
();
mainBoxLayout
->
setMargin
(
0
);
setLayout
(
mainBoxLayout
);
...
...
@@ -100,7 +102,7 @@ S60DeviceRunConfigurationWidget::S60DeviceRunConfigurationWidget(
connect
(
m_serialPortsCombo
,
SIGNAL
(
activated
(
int
)),
this
,
SLOT
(
setSerialPort
(
int
)));
QHBoxLayout
*
serialPortHBoxLayout
=
new
QHBoxLayout
;
serialPortHBoxLayout
->
addWidget
(
m_serialPortsCombo
);
serialPortHBoxLayout
->
addSpacerItem
(
new
QSpacerItem
(
0
,
0
,
QSizePolicy
::
Minimum
Expanding
,
QSizePolicy
::
Ignored
));
serialPortHBoxLayout
->
addSpacerItem
(
new
QSpacerItem
(
0
,
0
,
QSizePolicy
::
Expanding
,
QSizePolicy
::
Ignored
));
formLayout
->
addRow
(
tr
(
"Device on Serial Port:"
),
serialPortHBoxLayout
);
...
...
@@ -218,7 +220,8 @@ void S60DeviceRunConfigurationWidget::nameEdited(const QString &text)
void
S60DeviceRunConfigurationWidget
::
updateTargetInformation
()
{
m_sisxFileLabel
->
setText
(
m_runConfiguration
->
basePackageFilePath
()
+
QLatin1String
(
".sisx"
));
m_sisxFileLabel
->
setText
(
QDir
::
toNativeSeparators
(
m_runConfiguration
->
basePackageFilePath
()
+
QLatin1String
(
".sisx"
)));
}
void
S60DeviceRunConfigurationWidget
::
setSerialPort
(
int
index
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment