Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
895cffa0
Commit
895cffa0
authored
Dec 15, 2008
by
hjk
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta
parents
4b0fc13d
006ee8f1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
4 deletions
+24
-4
doc/qtcreator.qdoc
doc/qtcreator.qdoc
+7
-2
src/plugins/projectexplorer/compileoutputwindow.h
src/plugins/projectexplorer/compileoutputwindow.h
+1
-1
src/plugins/qt4projectmanager/qt4project.cpp
src/plugins/qt4projectmanager/qt4project.cpp
+16
-1
No files found.
doc/qtcreator.qdoc
View file @
895cffa0
...
...
@@ -605,7 +605,7 @@
\o Ctrl+K, l, Space, and the line number
\o \image qtcreator-locator-line.png
\row
\o Go to a
function
definition
\o Go to a
symbol
definition
\o Ctrl+K, :, Space, and the function name
\row
\o Go to a help topic
...
...
@@ -626,9 +626,14 @@
\o Ctrl+K, p, Space, and the function name.
\row
\o Go to a class
in the current project
\o Go to a class
definition
\o Ctrl+K, c, Space, and the class name.
\o \image qtcreator-locator-classes.png
\row
\o Go to a method definition
\o Ctrl+K, m, Space, and the class name.
\o \image qtcreator-locator-methods.png
\endtable
*/
...
...
src/plugins/projectexplorer/compileoutputwindow.h
View file @
895cffa0
...
...
@@ -52,7 +52,7 @@ public:
CompileOutputWindow
(
BuildManager
*
bm
);
QWidget
*
outputWidget
(
QWidget
*
);
QList
<
QWidget
*>
toolBarWidgets
(
void
)
const
{
return
QList
<
QWidget
*>
();
}
QString
name
()
const
{
return
tr
(
"Compile"
);
}
QString
name
()
const
{
return
tr
(
"Compile
Output
"
);
}
int
priorityInStatusBar
()
const
;
void
clearContents
();
void
visibilityChanged
(
bool
visible
);
...
...
src/plugins/qt4projectmanager/qt4project.cpp
View file @
895cffa0
...
...
@@ -621,7 +621,22 @@ void Qt4Project::addDefaultBuild()
// Restoring configuration
// Do we already have a gdbmacrobuildstep?
// If not add it and disable linking of debugging helper
// TODO
// Check for old link debugging helper setting in each buildConfiguration
// We add a gdbmacrosbuildstep if at least one has it
// TODO remove migration code from pre beta
foreach
(
const
QString
&
bc
,
buildConfigurations
())
{
QVariant
v
=
value
(
bc
,
"addQDumper"
);
if
(
v
.
isValid
()
&&
v
.
toBool
())
{
GdbMacrosBuildStep
*
gdbmacrostep
=
new
GdbMacrosBuildStep
(
this
);
insertBuildStep
(
0
,
gdbmacrostep
);
break
;
}
}
foreach
(
const
QString
&
bc
,
buildConfigurations
())
{
setValue
(
bc
,
"addQDumper"
,
QVariant
());
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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