summaryrefslogtreecommitdiffstats
path: root/buildtools/qmake/trollprojectpart.cpp
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-10-23 11:48:34 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-10-23 11:48:34 +0900
commit0ffe0dfb29f3be5bb87b977b3a8ae1d9cd4346d5 (patch)
tree9d6b46524badc15e4915e37777375b31ef326068 /buildtools/qmake/trollprojectpart.cpp
parent91d8d752c79df1bb4db425affd34116ec1157dd7 (diff)
parentca46c5047fd0f619486b89e032c34d9a5664cdcb (diff)
downloadtdevelop-0ffe0dfb29f3be5bb87b977b3a8ae1d9cd4346d5.tar.gz
tdevelop-0ffe0dfb29f3be5bb87b977b3a8ae1d9cd4346d5.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdevelop
Diffstat (limited to 'buildtools/qmake/trollprojectpart.cpp')
-rw-r--r--buildtools/qmake/trollprojectpart.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp
index c71afc30..eeccf445 100644
--- a/buildtools/qmake/trollprojectpart.cpp
+++ b/buildtools/qmake/trollprojectpart.cpp
@@ -140,7 +140,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS
"project directory.<br>Environment variables and make arguments can be specified "
"in the project settings dialog, <b>Make Options</b> tab."));
- action = new TDEAction( i18n("Execute Main Program"), "exec", SHIFT+Key_F9,
+ action = new TDEAction( i18n("Execute Main Program"), "application-x-executable", SHIFT+Key_F9,
this, TQT_SLOT(slotBuildAndExecuteProject()),
actionCollection(), "build_execute_project" );
action->setToolTip(i18n("Execute main program"));
@@ -191,7 +191,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS
"Environment variables and make arguments can be specified "
"in the project settings dialog, <b>Make Options</b> tab."));
- action = new TDEAction( i18n("Execute Subproject"), "exec", 0,
+ action = new TDEAction( i18n("Execute Subproject"), "application-x-executable", 0,
this, TQT_SLOT(slotBuildAndExecuteTarget()),
actionCollection(), "build_execute_target" );
action->setToolTip(i18n("Execute subproject"));
@@ -270,13 +270,13 @@ TQString TrollProjectPart::makeEnvironment()
void TrollProjectPart::projectConfigWidget(KDialogBase *dlg)
{
TQVBox *vbox;
- vbox = dlg->addVBoxPage(i18n("Run Options"), i18n("Run Options"), BarIcon( "make", TDEIcon::SizeMedium ));
+ vbox = dlg->addVBoxPage(i18n("Run Options"), i18n("Run Options"), BarIcon( "text-x-makefile", TDEIcon::SizeMedium ));
RunOptionsWidget *optdlg = new RunOptionsWidget(*projectDom(), "/kdevtrollproject", buildDirectory(), vbox);
- vbox = dlg->addVBoxPage(i18n("Make Options"), i18n("Make Options"), BarIcon( "make", TDEIcon::SizeMedium ));
+ vbox = dlg->addVBoxPage(i18n("Make Options"), i18n("Make Options"), BarIcon( "text-x-makefile", TDEIcon::SizeMedium ));
MakeOptionsWidget *w4 = new MakeOptionsWidget(*projectDom(), "/kdevtrollproject", vbox);
- vbox = dlg->addVBoxPage(i18n("TQMake Manager"), i18n("TQMake Manager"), BarIcon( "make", TDEIcon::SizeMedium ));
+ vbox = dlg->addVBoxPage(i18n("TQMake Manager"), i18n("TQMake Manager"), BarIcon( "text-x-makefile", TDEIcon::SizeMedium ));
QMakeOptionsWidget *qm = new QMakeOptionsWidget( projectDirectory(), *projectDom(), "/kdevtrollproject", vbox);