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
3c99f02b
Commit
3c99f02b
authored
Feb 16, 2010
by
dt
Browse files
Rename QMake to qmake since that's the official spelling.
parent
8e04e423
Changes
10
Hide whitespace changes
Inline
Side-by-side
doc/qtcreator.qdoc
View file @
3c99f02b
...
...
@@ -382,7 +382,7 @@
\i \image qtcreator-qt4-qtversions.png
\i \bold{Linux and Mac OS X}
On Linux and Mac OS X, set the \gui{path to
QM
ake}
On Linux and Mac OS X, set the \gui{path to
qm
ake}
to the \c qmake binary of the Qt installation. If a Qt is
found in the \c PATH environment variable, it shows up
automatically as \gui{Qt in PATH}.
...
...
@@ -1966,7 +1966,7 @@
describe the procedure required for each project type.
\section1
QM
ake Projects (the default)
\section1
qm
ake Projects (the default)
Open your project file (\c{.pro}) from the \gui{Projects} pane. Then,
follow the guidelines in the
...
...
src/plugins/coreplugin/mimedatabase.cpp
View file @
3c99f02b
...
...
@@ -85,7 +85,7 @@ enum { BinaryMatchPriority = 1, TextMatchPriority = 2};
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
<!-- Mime types must match the desktop file associations -->
<mime-type type="application/vnd.nokia.qt.qmakeprofile">
<comment xml:lang="en">Qt
QM
ake Profile</comment>
<comment xml:lang="en">Qt
qm
ake Profile</comment>
<glob pattern="*.pro"/>
</mime-type>
</mime-info>
...
...
src/plugins/qt4projectmanager/projectloadwizard.cpp
View file @
3c99f02b
...
...
@@ -204,7 +204,7 @@ void ProjectLoadWizard::setupImportPage(QtVersion *version, QtVersion::QmakeBuil
importLabel
->
setText
(
tr
(
"Qt Creator has found an already existing build in the source directory.<br><br>"
"<b>Qt Version:</b> %1<br>"
"<b>Build configuration:</b> %2<br>"
"<b>Additional
QM
ake Arguments:</b>%3"
)
"<b>Additional
qm
ake Arguments:</b>%3"
)
.
arg
(
versionString
)
.
arg
(
buildConfigString
)
.
arg
(
ProjectExplorer
::
Environment
::
joinArgumentList
(
addtionalArguments
)));
...
...
src/plugins/qt4projectmanager/qmakestep.cpp
View file @
3c99f02b
...
...
@@ -77,7 +77,7 @@ QMakeStep::QMakeStep(Qt4BuildConfiguration *bc, QMakeStep *bs) :
void
QMakeStep
::
ctor
()
{
setDisplayName
(
tr
(
"
QM
ake"
,
"QMakeStep display name."
));
setDisplayName
(
tr
(
"
qm
ake"
,
"QMakeStep display name."
));
}
QMakeStep
::~
QMakeStep
()
...
...
@@ -187,7 +187,7 @@ void QMakeStep::run(QFutureInterface<bool> &fi)
}
if
(
!
m_needToRunQMake
)
{
emit
addOutput
(
tr
(
"<font color=
\"
#0000ff
\"
>Configuration unchanged, skipping
QM
ake step.</font>"
));
emit
addOutput
(
tr
(
"<font color=
\"
#0000ff
\"
>Configuration unchanged, skipping
qm
ake step.</font>"
));
fi
.
reportResult
(
true
);
return
;
}
...
...
@@ -362,7 +362,7 @@ void QMakeStepConfigWidget::updateSummaryLabel()
Qt4BuildConfiguration
*
qt4bc
=
m_step
->
qt4BuildConfiguration
();
const
QtVersion
*
qtVersion
=
qt4bc
->
qtVersion
();
if
(
!
qtVersion
)
{
m_summaryText
=
tr
(
"<b>
QM
ake:</b> No Qt version set.
QMake c
an not be run."
);
m_summaryText
=
tr
(
"<b>
qm
ake:</b> No Qt version set.
C
an not be run
qmake
."
);
emit
updateSummary
();
return
;
}
...
...
@@ -376,7 +376,7 @@ void QMakeStepConfigWidget::updateSummaryLabel()
// And we only use the .pro filename not the full path
QString
program
=
QFileInfo
(
qtVersion
->
qmakeCommand
()).
fileName
();
m_summaryText
=
tr
(
"<b>
QM
ake:</b> %1 %2"
).
arg
(
program
,
args
.
join
(
QString
(
QLatin1Char
(
' '
))));
m_summaryText
=
tr
(
"<b>
qm
ake:</b> %1 %2"
).
arg
(
program
,
args
.
join
(
QString
(
QLatin1Char
(
' '
))));
emit
updateSummary
();
}
...
...
@@ -462,6 +462,6 @@ QStringList QMakeStepFactory::availableCreationIds(ProjectExplorer::BuildConfigu
QString
QMakeStepFactory
::
displayNameForId
(
const
QString
&
id
)
const
{
if
(
id
==
QLatin1String
(
QMAKE_BS_ID
))
return
tr
(
"
QM
ake"
);
return
tr
(
"
qm
ake"
);
return
QString
();
}
src/plugins/qt4projectmanager/qmakestep.ui
View file @
3c99f02b
...
...
@@ -17,7 +17,7 @@
<item
row=
"0"
column=
"0"
>
<widget
class=
"QLabel"
name=
"label_2"
>
<property
name=
"text"
>
<string>
QM
ake Build Configuration:
</string>
<string>
qm
ake Build Configuration:
</string>
</property>
</widget>
</item>
...
...
src/plugins/qt4projectmanager/qt-s60/s60devices.cpp
View file @
3c99f02b
...
...
@@ -315,7 +315,7 @@ QString S60Devices::cleanedRootPath(const QString &deviceRoot)
QString
path
=
deviceRoot
;
#ifdef Q_OS_WIN
// sbsv2 actually recommends having the DK on a separate drive...
// But
QM
ake breaks when doing that!
// But
qm
ake breaks when doing that!
if
(
path
.
size
()
>
1
&&
path
.
at
(
1
)
==
QChar
(
':'
))
path
=
path
.
mid
(
2
);
#endif
...
...
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
View file @
3c99f02b
...
...
@@ -434,7 +434,7 @@ bool Qt4BuildConfiguration::compareToImportFrom(const QString &workingDirectory)
QPair
<
QtVersion
::
QmakeBuildConfigs
,
QStringList
>
result
=
QtVersionManager
::
scanMakeFile
(
workingDirectory
,
version
->
defaultBuildConfig
());
if
(
qmakeBuildConfiguration
()
==
result
.
first
)
{
// The
QM
ake Build Configuration are the same,
// The
qm
ake Build Configuration are the same,
// now compare arguments lists
// we have to compare without the spec/platform cmd argument
// and compare that on its own
...
...
src/plugins/qt4projectmanager/qtoptionspage.cpp
View file @
3c99f02b
...
...
@@ -151,7 +151,7 @@ QtOptionsPageWidget::QtOptionsPageWidget(QWidget *parent, QList<QtVersion *> ver
m_ui
->
setupUi
(
this
);
m_ui
->
qmakePath
->
setExpectedKind
(
Utils
::
PathChooser
::
File
);
m_ui
->
qmakePath
->
setPromptDialogTitle
(
tr
(
"Select
QM
ake Executable"
));
m_ui
->
qmakePath
->
setPromptDialogTitle
(
tr
(
"Select
qm
ake Executable"
));
m_ui
->
mingwPath
->
setExpectedKind
(
Utils
::
PathChooser
::
Directory
);
m_ui
->
mingwPath
->
setPromptDialogTitle
(
tr
(
"Select the MinGW Directory"
));
m_ui
->
mwcPath
->
setExpectedKind
(
Utils
::
PathChooser
::
Directory
);
...
...
src/plugins/qt4projectmanager/qtversionmanager.cpp
View file @
3c99f02b
...
...
@@ -1385,7 +1385,7 @@ QString QtVersion::invalidReason() const
if
(
isValid
())
return
QString
();
if
(
qmakeCommand
().
isEmpty
())
return
QApplication
::
translate
(
"QtVersion"
,
"No
QM
ake path set"
);
return
QApplication
::
translate
(
"QtVersion"
,
"No
qm
ake path set"
);
if
(
displayName
().
isEmpty
())
return
QApplication
::
translate
(
"QtVersion"
,
"Qt Version has no name"
);
if
(
m_notInstalled
)
...
...
src/plugins/qt4projectmanager/qtversionmanager.ui
View file @
3c99f02b
...
...
@@ -6,7 +6,7 @@
<rect>
<x>
0
</x>
<y>
0
</y>
<width>
37
5
</width>
<width>
40
5
</width>
<height>
474
</height>
</rect>
</property>
...
...
@@ -34,7 +34,7 @@
</column>
<column>
<property
name=
"text"
>
<string>
QM
ake Location
</string>
<string>
qm
ake Location
</string>
</property>
</column>
<column>
...
...
@@ -110,7 +110,7 @@
<item
row=
"1"
column=
"0"
>
<widget
class=
"QLabel"
name=
"pathLabel"
>
<property
name=
"text"
>
<string>
QM
ake Location:
</string>
<string>
qm
ake Location:
</string>
</property>
</widget>
</item>
...
...
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