summaryrefslogtreecommitdiffstats
path: root/buildtools/qmake/scope.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'buildtools/qmake/scope.cpp')
-rw-r--r--buildtools/qmake/scope.cpp42
1 files changed, 7 insertions, 35 deletions
diff --git a/buildtools/qmake/scope.cpp b/buildtools/qmake/scope.cpp
index 84052970..4e2b079a 100644
--- a/buildtools/qmake/scope.cpp
+++ b/buildtools/qmake/scope.cpp
@@ -514,10 +514,7 @@ Scope* Scope::createSimpleScope( const TQString& scopename )
ast->setDepth( m_root->depth() );
m_root->addChildAST( ast );
m_root->addChildAST( new TQMake::NewLineAST() );
- /* We can't unconditionally add the scope name to CONFIG, scope might be win32 which may only be in CONFIG under windows.
- if ( m_part->isTQt4Project() )
- addToPlusOp( "CONFIG", TQStringList( scopename ) );
- */
+ // We can't unconditionally add the scope name to CONFIG, scope might be win32 which may only be in CONFIG under windows.
Scope* simpleScope = new Scope( m_environment, getNextScopeNum(), this, ast, m_defaultopts, m_part );
if( simpleScope->scopeType() != Scope::InvalidScope )
@@ -1182,11 +1179,6 @@ TQStringList Scope::cleanStringList(const TQStringList& list) const
return result;
}
-bool Scope::isTQt4Project() const
-{
- return m_part->isTQt4Project();
-}
-
void Scope::reloadProject()
{
if ( !m_root || !m_root->isProject() )
@@ -1426,16 +1418,6 @@ void Scope::allFiles( const TQString& projectDirectory, std::set<TQString>& res
}
}
- if ( isTQt4Project() )
- {
- values = variableValues( "RESOURCES" ,false, false );
- for ( it = values.begin(); it != values.end(); ++it )
- {
- file = myRelPath + TQString(TQChar(TQDir::separator())) + *it;
- file = resolveVariables( file );
- res.insert( TQDir::cleanDirPath( file ) );
- }
- }
values = variableValues( "IMAGES" ,false, false );
for ( it = values.begin(); it != values.end(); ++it )
{
@@ -1481,22 +1463,12 @@ void Scope::allFiles( const TQString& projectDirectory, std::set<TQString>& res
file = resolveVariables( file );
res.insert( TQDir::cleanDirPath( file ) );
- if( !m_part->isTQt4Project())
- {
- header = projectDir()+TQString(TQChar(TQDir::separator())) + *it+".h";
- if( TQFileInfo(header).exists() )
- res.insert( TQDir::cleanDirPath( header ) );
- header = projectDir()+TQString(TQChar(TQDir::separator())) + *it+".cpp";
- if( TQFileInfo(header).exists() )
- res.insert( TQDir::cleanDirPath( header ) );
- }
- else
- {
- header = projectDir()+TQString(TQChar(TQDir::separator())) + "ui_" +*it;
- header.replace(TQRegExp("\\.ui$"),".h");
- if( TQFileInfo(header).exists() )
- res.insert( TQDir::cleanDirPath( header ) );
- }
+ header = projectDir()+TQString(TQChar(TQDir::separator())) + *it+".h";
+ if( TQFileInfo(header).exists() )
+ res.insert( TQDir::cleanDirPath( header ) );
+ header = projectDir()+TQString(TQChar(TQDir::separator())) + *it+".cpp";
+ if( TQFileInfo(header).exists() )
+ res.insert( TQDir::cleanDirPath( header ) );
}
}