Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
af625797
Commit
af625797
authored
Apr 20, 2009
by
dt
Browse files
Refactoring: Renamed Qt4BuildConfigWidget to Qt4ProjectConfigWidget
parent
9689582e
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt4
build
configwidget.cpp
→
src/plugins/qt4projectmanager/qt4
project
configwidget.cpp
View file @
af625797
...
...
@@ -27,14 +27,14 @@
**
**************************************************************************/
#include
"qt4
build
configwidget.h"
#include
"qt4
project
configwidget.h"
#include
"makestep.h"
#include
"qmakestep.h"
#include
"qt4project.h"
#include
"qt4projectmanagerconstants.h"
#include
"qt4projectmanager.h"
#include
"ui_qt4
build
configwidget.h"
#include
"ui_qt4
project
configwidget.h"
#include
<coreplugin/icore.h>
#include
<coreplugin/mainwindow.h>
...
...
@@ -48,11 +48,11 @@ bool debug = false;
using
namespace
Qt4ProjectManager
;
using
namespace
Qt4ProjectManager
::
Internal
;
Qt4
Build
ConfigWidget
::
Qt4
Build
ConfigWidget
(
Qt4Project
*
project
)
Qt4
Project
ConfigWidget
::
Qt4
Project
ConfigWidget
(
Qt4Project
*
project
)
:
BuildStepConfigWidget
(),
m_pro
(
project
)
{
m_ui
=
new
Ui
::
Qt4
Build
ConfigWidget
();
m_ui
=
new
Ui
::
Qt4
Project
ConfigWidget
();
m_ui
->
setupUi
(
this
);
m_ui
->
shadowBuildDirEdit
->
setPromptDialogTitle
(
tr
(
"Shadow Build Directory"
));
m_ui
->
shadowBuildDirEdit
->
setExpectedKind
(
Core
::
Utils
::
PathChooser
::
Directory
);
...
...
@@ -83,27 +83,27 @@ Qt4BuildConfigWidget::Qt4BuildConfigWidget(Qt4Project *project)
this
,
SLOT
(
setupQtVersionsComboBox
()));
}
Qt4
Build
ConfigWidget
::~
Qt4
Build
ConfigWidget
()
Qt4
Project
ConfigWidget
::~
Qt4
Project
ConfigWidget
()
{
delete
m_ui
;
}
void
Qt4
Build
ConfigWidget
::
manageQtVersions
()
void
Qt4
Project
ConfigWidget
::
manageQtVersions
()
{
Core
::
ICore
*
core
=
Core
::
ICore
::
instance
();
core
->
showOptionsDialog
(
Constants
::
QT_CATEGORY
,
Constants
::
QTVERSION_PAGE
);
}
QString
Qt4
Build
ConfigWidget
::
displayName
()
const
QString
Qt4
Project
ConfigWidget
::
displayName
()
const
{
return
tr
(
"General"
);
}
void
Qt4
Build
ConfigWidget
::
init
(
const
QString
&
buildConfiguration
)
void
Qt4
Project
ConfigWidget
::
init
(
const
QString
&
buildConfiguration
)
{
if
(
debug
)
qDebug
()
<<
"Qt4
Build
ConfigWidget::init()"
;
qDebug
()
<<
"Qt4
Project
ConfigWidget::init()"
;
m_buildConfiguration
=
buildConfiguration
;
...
...
@@ -118,12 +118,12 @@ void Qt4BuildConfigWidget::init(const QString &buildConfiguration)
updateImportLabel
();
}
void
Qt4
Build
ConfigWidget
::
changeConfigName
(
const
QString
&
newName
)
void
Qt4
Project
ConfigWidget
::
changeConfigName
(
const
QString
&
newName
)
{
m_pro
->
setDisplayNameFor
(
m_buildConfiguration
,
newName
);
}
void
Qt4
Build
ConfigWidget
::
setupQtVersionsComboBox
()
void
Qt4
Project
ConfigWidget
::
setupQtVersionsComboBox
()
{
if
(
m_buildConfiguration
.
isEmpty
())
// not yet initialized
return
;
...
...
@@ -155,14 +155,14 @@ void Qt4BuildConfigWidget::setupQtVersionsComboBox()
this
,
SLOT
(
qtVersionComboBoxCurrentIndexChanged
(
QString
)));
}
void
Qt4
Build
ConfigWidget
::
onBeforeBeforeShadowBuildDirBrowsed
()
void
Qt4
Project
ConfigWidget
::
onBeforeBeforeShadowBuildDirBrowsed
()
{
QString
initialDirectory
=
QFileInfo
(
m_pro
->
file
()
->
fileName
()).
absolutePath
();
if
(
!
initialDirectory
.
isEmpty
())
m_ui
->
shadowBuildDirEdit
->
setInitialBrowsePathBackup
(
initialDirectory
);
}
void
Qt4
Build
ConfigWidget
::
shadowBuildCheckBoxClicked
(
bool
checked
)
void
Qt4
Project
ConfigWidget
::
shadowBuildCheckBoxClicked
(
bool
checked
)
{
m_ui
->
shadowBuildDirEdit
->
setEnabled
(
checked
);
bool
b
=
m_ui
->
shadowBuildCheckBox
->
isChecked
();
...
...
@@ -173,7 +173,7 @@ void Qt4BuildConfigWidget::shadowBuildCheckBoxClicked(bool checked)
m_pro
->
setValue
(
m_buildConfiguration
,
"buildDirectory"
,
QVariant
(
QString
::
null
));
}
void
Qt4
Build
ConfigWidget
::
updateImportLabel
()
void
Qt4
Project
ConfigWidget
::
updateImportLabel
()
{
m_ui
->
importLabel
->
setVisible
(
false
);
if
(
m_ui
->
shadowBuildCheckBox
->
isChecked
())
{
...
...
@@ -184,7 +184,7 @@ void Qt4BuildConfigWidget::updateImportLabel()
}
}
void
Qt4
Build
ConfigWidget
::
shadowBuildLineEditTextChanged
()
void
Qt4
Project
ConfigWidget
::
shadowBuildLineEditTextChanged
()
{
if
(
m_pro
->
value
(
m_buildConfiguration
,
"buildDirectory"
).
toString
()
==
m_ui
->
shadowBuildDirEdit
->
path
())
return
;
...
...
@@ -206,7 +206,7 @@ void Qt4BuildConfigWidget::shadowBuildLineEditTextChanged()
// }
}
void
Qt4
Build
ConfigWidget
::
importLabelClicked
()
void
Qt4
Project
ConfigWidget
::
importLabelClicked
()
{
if
(
m_ui
->
shadowBuildCheckBox
->
isChecked
())
{
QString
directory
=
m_ui
->
shadowBuildDirEdit
->
path
();
...
...
@@ -252,7 +252,7 @@ void Qt4BuildConfigWidget::importLabelClicked()
setupQtVersionsComboBox
();
}
void
Qt4
Build
ConfigWidget
::
qtVersionComboBoxCurrentIndexChanged
(
const
QString
&
)
void
Qt4
Project
ConfigWidget
::
qtVersionComboBoxCurrentIndexChanged
(
const
QString
&
)
{
//Qt Version
int
newQtVersion
;
...
...
src/plugins/qt4projectmanager/qt4
build
configwidget.h
→
src/plugins/qt4projectmanager/qt4
project
configwidget.h
View file @
af625797
...
...
@@ -27,8 +27,8 @@
**
**************************************************************************/
#ifndef QT4
BUILD
CONFIGWIDGET_H
#define QT4
BUILD
CONFIGWIDGET_H
#ifndef QT4
PROJECT
CONFIGWIDGET_H
#define QT4
PROJECT
CONFIGWIDGET_H
#include
<projectexplorer/buildstep.h>
...
...
@@ -39,15 +39,15 @@ class Qt4Project;
namespace
Internal
{
namespace
Ui
{
class
Qt4
Build
ConfigWidget
;
class
Qt4
Project
ConfigWidget
;
}
class
Qt4
Build
ConfigWidget
:
public
ProjectExplorer
::
BuildStepConfigWidget
class
Qt4
Project
ConfigWidget
:
public
ProjectExplorer
::
BuildStepConfigWidget
{
Q_OBJECT
public:
Qt4
Build
ConfigWidget
(
Qt4Project
*
project
);
~
Qt4
Build
ConfigWidget
();
Qt4
Project
ConfigWidget
(
Qt4Project
*
project
);
~
Qt4
Project
ConfigWidget
();
QString
displayName
()
const
;
void
init
(
const
QString
&
buildConfiguration
);
...
...
@@ -64,7 +64,7 @@ private slots:
private:
void
updateImportLabel
();
Ui
::
Qt4
Build
ConfigWidget
*
m_ui
;
Ui
::
Qt4
Project
ConfigWidget
*
m_ui
;
Qt4Project
*
m_pro
;
QString
m_buildConfiguration
;
};
...
...
@@ -72,4 +72,4 @@ private:
}
// namespace Internal
}
// namespace Qt4ProjectManager
#endif // QT4
BUILD
CONFIGWIDGET_H
#endif // QT4
PROJECT
CONFIGWIDGET_H
src/plugins/qt4projectmanager/qt4
build
configwidget.ui
→
src/plugins/qt4projectmanager/qt4
project
configwidget.ui
View file @
af625797
<?xml version="1.0" encoding="UTF-8"?>
<ui
version=
"4.0"
>
<class>
Qt4ProjectManager::Internal::Qt4
Build
ConfigWidget
</class>
<widget
class=
"QWidget"
name=
"Qt4ProjectManager::Internal::Qt4
Build
ConfigWidget"
>
<class>
Qt4ProjectManager::Internal::Qt4
Project
ConfigWidget
</class>
<widget
class=
"QWidget"
name=
"Qt4ProjectManager::Internal::Qt4
Project
ConfigWidget"
>
<property
name=
"geometry"
>
<rect>
<x>
0
</x>
...
...
src/plugins/qt4projectmanager/qt4projectmanager.pro
View file @
af625797
...
...
@@ -31,7 +31,7 @@ HEADERS = qt4projectmanagerplugin.h \
embeddedpropertiespage
.
h
\
qt4runconfiguration
.
h
\
speinfo
.
h
\
qt4
build
configwidget
.
h
\
qt4
project
configwidget
.
h
\
qt4buildenvironmentwidget
.
h
\
projectloadwizard
.
h
SOURCES
=
qt4projectmanagerplugin
.
cpp
\
...
...
@@ -60,7 +60,7 @@ SOURCES = qt4projectmanagerplugin.cpp \
embeddedpropertiespage
.
cpp
\
qt4runconfiguration
.
cpp
\
speinfo
.
cpp
\
qt4
build
configwidget
.
cpp
\
qt4
project
configwidget
.
cpp
\
qt4buildenvironmentwidget
.
cpp
\
projectloadwizard
.
cpp
FORMS
=
qtversionmanager
.
ui
\
...
...
@@ -69,7 +69,7 @@ FORMS = qtversionmanager.ui \
proeditorcontainer
.
ui
\
makestep
.
ui
\
qmakestep
.
ui
\
qt4
build
configwidget
.
ui
\
qt4
project
configwidget
.
ui
\
embeddedpropertiespage
.
ui
\
qt4buildenvironmentwidget
.
ui
\
showbuildlog
.
ui
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment