[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/kdevelop/3.4/buildtools/qmake
From: Andreas Pakulat <apaku () gmx ! de>
Date: 2007-01-02 21:00:23
Message-ID: 1167771623.937187.4225.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 619142 by apaku:
Provide a argument edit for application subprojects
Use subproject arguments if useGlobalProgram is false
Use runArguments when executing project or target
M +4 -0 projectconfigurationdlg.cpp
M +39 -5 projectconfigurationdlgbase.ui
M +11 -1 trollprojectpart.cpp
M +2 -2 trollprojectwidget.cpp
--- branches/kdevelop/3.4/buildtools/qmake/projectconfigurationdlg.cpp #619141:619142
@@ -164,6 +164,9 @@
if( myProjectItem->scope->variableValues( "CONFIG" ).findIndex( "dll" ) \
!= -1 )
myProjectItem->scope->removeFromPlusOp( "CONFIG", "dll" );
myProjectItem->setPixmap( 0, SmallIcon( "qmake_app" ) );
+ kdDebug(9024) << "Setting runarguments to " << m_editArguments->text() \
<< endl; + DomUtil::writeEntry( *prjWidget->m_part->projectDom(), \
"/kdevtrollproject/run/runarguments/"+prjWidget->getCurrentOutputFilename(), \
m_editArguments->text() ); + kdDebug(9024) << "Have runarguments " << \
DomUtil::readEntry( *prjWidget->m_part->projectDom(), \
"/kdevtrollproject/run/runarguments/"+prjWidget->getCurrentOutputFilename() ) << \
endl; }
else if ( radioLibrary->isChecked() )
{
@@ -653,6 +656,7 @@
{
checkConsole->setChecked( true );
}
+ m_editArguments->setText( DomUtil::readEntry( \
*prjWidget->m_part->projectDom(), \
"/kdevtrollproject/run/runarguments/"+prjWidget->getCurrentOutputFilename(), "" ) ); \
}
// Buildmode
--- branches/kdevelop/3.4/buildtools/qmake/projectconfigurationdlgbase.ui \
#619141:619142 @@ -118,10 +118,10 @@
<cstring>radioLibrary</cstring>
</property>
<property name="text">
- <string>&Library</string>
+ <string>Librar&y</string>
</property>
<property name="accel">
- <string>Alt+L</string>
+ <string>Alt+Y</string>
</property>
<property name="toolTip" stdset="0">
<string>Create a library</string>
@@ -247,7 +247,7 @@
</sizepolicy>
</property>
<property name="text">
- <string>Browse...</string>
+ <string>&Browse...</string>
</property>
<property name="toolTip" stdset="0">
<string>Browse</string>
@@ -276,10 +276,10 @@
<cstring>checkInstallTarget</cstring>
</property>
<property name="text">
- <string>Install</string>
+ <string>I&nstall</string>
</property>
<property name="accel">
- <string></string>
+ <string>Alt+N</string>
</property>
</widget>
<widget class="QLabel" row="0" column="1">
@@ -313,6 +313,27 @@
</widget>
</grid>
</widget>
+ <widget class="QGroupBox">
+ <property name="name">
+ <cstring>argumentsGroupBox</cstring>
+ </property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="title">
+ <string>Program arguments</string>
+ </property>
+ <vbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="KLineEdit">
+ <property name="name">
+ <cstring>m_editArguments</cstring>
+ </property>
+ </widget>
+ </vbox>
+ </widget>
<spacer>
<property name="name">
<cstring>Spacer3</cstring>
@@ -2678,6 +2699,18 @@
<receiver>ProjectConfigurationDlgBase</receiver>
<slot>customVarChanged()</slot>
</connection>
+ <connection>
+ <sender>radioApplication</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>argumentsGroupBox</receiver>
+ <slot>setEnabled(bool)</slot>
+ </connection>
+ <connection>
+ <sender>m_editArguments</sender>
+ <signal>textChanged(const QString&)</signal>
+ <receiver>ProjectConfigurationDlgBase</receiver>
+ <slot>activateApply(const QString&)</slot>
+ </connection>
</connections>
<tabstops>
<tabstop>TabBuild</tabstop>
@@ -2848,6 +2881,7 @@
<includehint>kpushbutton.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>
+ <includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
--- branches/kdevelop/3.4/buildtools/qmake/trollprojectpart.cpp #619141:619142
@@ -538,7 +538,17 @@
/** Retuns a QString with the run command line arguments */
QString TrollProjectPart::runArguments() const
{
- return DomUtil::readEntry(*projectDom(), "/kdevtrollproject/run/programargs");
+ if( DomUtil::readBoolEntry(*projectDom(), \
"/kdevtrollproject/run/useglobalprogram", true) ) + {
+ return DomUtil::readEntry(*projectDom(), \
"/kdevtrollproject/run/programargs"); + }else
+ {
+ kdDebug(9024) << "Run Arguments" << DomUtil::readEntry(*projectDom(), \
"/kdevtrollproject/run/runarguments/"+m_widget->getCurrentOutputFilename() ) << endl; \
+ if( DomUtil::readEntry(*projectDom(), \
"/kdevtrollproject/run/runarguments/"+m_widget->getCurrentOutputFilename() \
).isEmpty() ) + return DomUtil::readEntry(*projectDom(), \
"/kdevtrollproject/run/programargs"); + else
+ return DomUtil::readEntry(*projectDom(), \
"/kdevtrollproject/run/runarguments/"+m_widget->getCurrentOutputFilename() ); + }
}
--- branches/kdevelop/3.4/buildtools/qmake/trollprojectwidget.cpp #619141:619142
@@ -648,7 +648,7 @@
}
program.prepend( runEnvVars );
- program.append( " " + DomUtil::readEntry( *( m_part->projectDom() ), \
"/kdevtrollproject/run/programargs" ) + " " ); + program.append( " " + \
m_part->runArguments() + " " ); // std::cerr<<dircmd + "./"+program<<std::endl;
// m_part->execute(dircmd + "./"+program);
// m_part->appFrontend()->startAppCommand(dircmd +"./"+program,true);
@@ -1963,7 +1963,7 @@
runEnvVars += pair.first + "=" + pair.second + " ";
}
program.prepend( runEnvVars );
- program.append( " " + DomUtil::readEntry( *( m_part->projectDom() ), \
"/kdevtrollproject/run/programargs" ) + " " ); + program.append( " " + \
m_part->runArguments() + " " );
QString dircmd = "cd " + KProcess::quote( this->projectDirectory() ) + " && " ;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic