diff options
Diffstat (limited to 'buildtools/qmake/projectconfigurationdlg.cpp')
| -rw-r--r-- | buildtools/qmake/projectconfigurationdlg.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/buildtools/qmake/projectconfigurationdlg.cpp b/buildtools/qmake/projectconfigurationdlg.cpp index 11b61507..b625f821 100644 --- a/buildtools/qmake/projectconfigurationdlg.cpp +++ b/buildtools/qmake/projectconfigurationdlg.cpp @@ -442,8 +442,8 @@ void ProjectConfigurationDlg::updateProjectConfiguration() } myProjectItem->updateValues( "DEFINES", TQStringList::split( " ", m_defines->text() ) ); - myProjectItem->updateValues( "TQMAKE_CXXFLAGS_DEBUG", TQStringList::split( " ", m_debugFlags->text() ) ); - myProjectItem->updateValues( "TQMAKE_CXXFLAGS_RELEASE", TQStringList::split( " ", m_releaseFlags->text() ) ); + myProjectItem->updateValues( "QMAKE_CXXFLAGS_DEBUG", TQStringList::split( " ", m_debugFlags->text() ) ); + myProjectItem->updateValues( "QMAKE_CXXFLAGS_RELEASE", TQStringList::split( " ", m_releaseFlags->text() ) ); //add selected includes TQStringList values; @@ -603,7 +603,7 @@ void ProjectConfigurationDlg::updateProjectConfiguration() // intermediate locations myProjectItem->scope->setEqualOp( "OBJECTS_DIR", TQStringList( objdir_url->url() ) ); myProjectItem->scope->setEqualOp( "UI_DIR", TQStringList( uidir_url->url() ) ); - myProjectItem->scope->setEqualOp( "TQMOC_DIR", TQStringList( tqmocdir_url->url() ) ); + myProjectItem->scope->setEqualOp( "QMOC_DIR", TQStringList( tqmocdir_url->url() ) ); myProjectItem->scope->setEqualOp( "RCC_DIR", TQStringList( rccdir_url->url() ) ); //CORBA @@ -941,8 +941,8 @@ void ProjectConfigurationDlg::updateControls() m_targetPath->setURL( dir ); m_defines->setText( myProjectItem->scope->variableValues( "DEFINES" ).join( " " ) ); - m_debugFlags->setText( myProjectItem->scope->variableValues( "TQMAKE_CXXFLAGS_DEBUG" ).join( " " ) ); - m_releaseFlags->setText( myProjectItem->scope->variableValues( "TQMAKE_CXXFLAGS_RELEASE" ).join( " " ) ); + m_debugFlags->setText( myProjectItem->scope->variableValues( "QMAKE_CXXFLAGS_DEBUG" ).join( " " ) ); + m_releaseFlags->setText( myProjectItem->scope->variableValues( "QMAKE_CXXFLAGS_RELEASE" ).join( " " ) ); updateIncludeControl(); updateLibControls(); @@ -971,7 +971,7 @@ void ProjectConfigurationDlg::updateControls() uidir_url->fileDialog()->setURL( KURL( dir ) ); } uidir_url->setURL( dir ); - dir = myProjectItem->scope->variableValues( "TQMOC_DIR" ).front(); + dir = myProjectItem->scope->variableValues( "QMOC_DIR" ).front(); if( TQFileInfo(dir).isRelative() ) { tqmocdir_url->completionObject()->setDir( myProjectItem->scope->projectDir() ); |