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
9cfe7078
Commit
9cfe7078
authored
15 years ago
by
dt
Browse files
Options
Downloads
Patches
Plain Diff
Disable the browse button if the shadow build checkbox is disabled.
parent
63fd503c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
+4
-2
4 additions, 2 deletions
src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
src/plugins/qt4projectmanager/qt4projectconfigwidget.h
+3
-0
3 additions, 0 deletions
src/plugins/qt4projectmanager/qt4projectconfigwidget.h
with
7 additions
and
2 deletions
src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
+
4
−
2
View file @
9cfe7078
...
@@ -58,11 +58,11 @@ Qt4ProjectConfigWidget::Qt4ProjectConfigWidget(Qt4Project *project)
...
@@ -58,11 +58,11 @@ Qt4ProjectConfigWidget::Qt4ProjectConfigWidget(Qt4Project *project)
m_ui
->
setupUi
(
this
);
m_ui
->
setupUi
(
this
);
// fix the layout
// fix the layout
QAbstractButton
*
browseButton
=
m_ui
->
shadowBuildDirEdit
->
buttonAtIndex
(
0
);
m_
browseButton
=
m_ui
->
shadowBuildDirEdit
->
buttonAtIndex
(
0
);
#ifdef Q_OS_WIN
#ifdef Q_OS_WIN
browseButton
->
setSizePolicy
(
QSizePolicy
::
Expanding
,
QSizePolicy
::
Expanding
);
browseButton
->
setSizePolicy
(
QSizePolicy
::
Expanding
,
QSizePolicy
::
Expanding
);
#endif
#endif
m_ui
->
gridLayout
->
addWidget
(
browseButton
,
4
,
2
);
m_ui
->
gridLayout
->
addWidget
(
m_
browseButton
,
4
,
2
);
int
minimumHeight
=
qMax
(
m_ui
->
qtVersionComboBox
->
sizeHint
().
height
(),
m_ui
->
manageQtVersionPushButtons
->
sizeHint
().
height
());
int
minimumHeight
=
qMax
(
m_ui
->
qtVersionComboBox
->
sizeHint
().
height
(),
m_ui
->
manageQtVersionPushButtons
->
sizeHint
().
height
());
Qt
::
Alignment
labelAlignment
=
Qt
::
Alignment
(
style
()
->
styleHint
(
QStyle
::
SH_FormLayoutLabelAlignment
));
Qt
::
Alignment
labelAlignment
=
Qt
::
Alignment
(
style
()
->
styleHint
(
QStyle
::
SH_FormLayoutLabelAlignment
));
for
(
int
i
=
0
;
i
<
m_ui
->
gridLayout
->
rowCount
();
++
i
)
{
for
(
int
i
=
0
;
i
<
m_ui
->
gridLayout
->
rowCount
();
++
i
)
{
...
@@ -137,6 +137,7 @@ void Qt4ProjectConfigWidget::init(const QString &buildConfiguration)
...
@@ -137,6 +137,7 @@ void Qt4ProjectConfigWidget::init(const QString &buildConfiguration)
bool
shadowBuild
=
m_pro
->
value
(
buildConfiguration
,
"useShadowBuild"
).
toBool
();
bool
shadowBuild
=
m_pro
->
value
(
buildConfiguration
,
"useShadowBuild"
).
toBool
();
m_ui
->
shadowBuildCheckBox
->
setChecked
(
shadowBuild
);
m_ui
->
shadowBuildCheckBox
->
setChecked
(
shadowBuild
);
m_ui
->
shadowBuildDirEdit
->
setEnabled
(
shadowBuild
);
m_ui
->
shadowBuildDirEdit
->
setEnabled
(
shadowBuild
);
m_browseButton
->
setEnabled
(
shadowBuild
);
m_ui
->
shadowBuildDirEdit
->
setPath
(
m_pro
->
buildDirectory
(
buildConfiguration
));
m_ui
->
shadowBuildDirEdit
->
setPath
(
m_pro
->
buildDirectory
(
buildConfiguration
));
updateImportLabel
();
updateImportLabel
();
updateToolChainCombo
();
updateToolChainCombo
();
...
@@ -189,6 +190,7 @@ void Qt4ProjectConfigWidget::onBeforeBeforeShadowBuildDirBrowsed()
...
@@ -189,6 +190,7 @@ void Qt4ProjectConfigWidget::onBeforeBeforeShadowBuildDirBrowsed()
void
Qt4ProjectConfigWidget
::
shadowBuildCheckBoxClicked
(
bool
checked
)
void
Qt4ProjectConfigWidget
::
shadowBuildCheckBoxClicked
(
bool
checked
)
{
{
m_ui
->
shadowBuildDirEdit
->
setEnabled
(
checked
);
m_ui
->
shadowBuildDirEdit
->
setEnabled
(
checked
);
m_browseButton
->
setEnabled
(
checked
);
bool
b
=
m_ui
->
shadowBuildCheckBox
->
isChecked
();
bool
b
=
m_ui
->
shadowBuildCheckBox
->
isChecked
();
m_pro
->
setValue
(
m_buildConfiguration
,
"useShadowBuild"
,
b
);
m_pro
->
setValue
(
m_buildConfiguration
,
"useShadowBuild"
,
b
);
if
(
b
)
if
(
b
)
...
...
This diff is collapsed.
Click to expand it.
src/plugins/qt4projectmanager/qt4projectconfigwidget.h
+
3
−
0
View file @
9cfe7078
...
@@ -31,6 +31,7 @@
...
@@ -31,6 +31,7 @@
#define QT4PROJECTCONFIGWIDGET_H
#define QT4PROJECTCONFIGWIDGET_H
#include
<projectexplorer/buildstep.h>
#include
<projectexplorer/buildstep.h>
#include
<QtGui/QPushButton>
namespace
Qt4ProjectManager
{
namespace
Qt4ProjectManager
{
...
@@ -62,12 +63,14 @@ private slots:
...
@@ -62,12 +63,14 @@ private slots:
void
qtVersionComboBoxCurrentIndexChanged
(
const
QString
&
);
void
qtVersionComboBoxCurrentIndexChanged
(
const
QString
&
);
void
manageQtVersions
();
void
manageQtVersions
();
void
selectToolChain
(
int
index
);
void
selectToolChain
(
int
index
);
void
toggleDetails
();
private:
private:
void
updateToolChainCombo
();
void
updateToolChainCombo
();
void
updateImportLabel
();
void
updateImportLabel
();
void
setToolChain
(
int
index
);
void
setToolChain
(
int
index
);
Ui
::
Qt4ProjectConfigWidget
*
m_ui
;
Ui
::
Qt4ProjectConfigWidget
*
m_ui
;
QAbstractButton
*
m_browseButton
;
Qt4Project
*
m_pro
;
Qt4Project
*
m_pro
;
QString
m_buildConfiguration
;
QString
m_buildConfiguration
;
};
};
...
...
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