[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:       2006-10-23 15:52:18
Message-ID: 1161618738.412902.13178.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 598452 by apaku:

- do not add TARGET/DESTDIR in subscopes if they are equal to the parent scope


 M  +11 -1     createscopedlgbase.ui  
 M  +11 -2     projectconfigurationdlg.cpp  


--- branches/kdevelop/3.4/buildtools/qmake/createscopedlgbase.ui #598451:598452
@@ -216,7 +216,7 @@
                                     <cstring>checkNotInc</cstring>
                                 </property>
                                 <property name="text">
-                                    <string>use !include instead of include</string>
+                                    <string>&amp;use !include instead of \
include</string>  </property>
                                 <property name="toolTip" stdset="0">
                                     <string>Use !include instead of include for the \
function scope</string> @@ -309,6 +309,16 @@
         <slot>reject()</slot>
     </connection>
 </connections>
+<tabstops>
+    <tabstop>incUrl</tabstop>
+    <tabstop>comboScopeType</tabstop>
+    <tabstop>checkNotInc</tabstop>
+    <tabstop>buttonOk</tabstop>
+    <tabstop>buttonCancel</tabstop>
+    <tabstop>editScopeName</tabstop>
+    <tabstop>editFunction</tabstop>
+    <tabstop>editArguments</tabstop>
+</tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
--- branches/kdevelop/3.4/buildtools/qmake/projectconfigurationdlg.cpp #598451:598452
@@ -334,8 +334,17 @@
             myProjectItem->scope->addToPlusOp( "CONFIG", *it );
     }
 
-    myProjectItem->scope->setEqualOp( "TARGET", QStringList( \
                m_targetOutputFile->text() ) );
-    myProjectItem->scope->setEqualOp( "DESTDIR", QStringList( m_targetPath->text() ) \
); +    if( myProjectItem->scope->scopeType() == Scope::FunctionScope || \
myProjectItem->scope->scopeType() == Scope::SimpleScope ) +    {
+        if( !myProjectItem->scope->variableValues("TARGET").contains( \
m_targetOutputFile->text() ) ) +            myProjectItem->scope->setEqualOp( \
"TARGET", QStringList( m_targetOutputFile->text() ) ); +        if( \
!myProjectItem->scope->variableValues("DESTDIR").contains( m_targetPath->text() ) ) + \
myProjectItem->scope->setEqualOp( "DESTDIR", QStringList( m_targetPath->text() ) ); + \
}else +    {
+        myProjectItem->scope->setEqualOp( "TARGET", QStringList( \
m_targetOutputFile->text() ) ); +        myProjectItem->scope->setEqualOp( "DESTDIR", \
QStringList( m_targetPath->text() ) ); +    }
 
     myProjectItem->updateValues( "DEFINES", QStringList::split( " ", \
                m_defines->text() ) );
     myProjectItem->updateValues( "QMAKE_CXXFLAGS_DEBUG", QStringList::split( " ", \
m_debugFlags->text() ) );


[prev in list] [next in list] [prev in thread] [next in thread]