diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-21 13:38:34 -0500 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-11-17 18:35:36 +0100 |
commit | a660674175fc38adc9a3d232e619cd856034b875 (patch) | |
tree | c246be2e75a2577ade93ed03c3bac231e83109bd /buildtools/qmake/projectconfigurationdlg.cpp | |
parent | 236c8d66c5bbcb9b3790de5f032699f12a95d990 (diff) | |
download | tdevelop-a660674175fc38adc9a3d232e619cd856034b875.tar.gz tdevelop-a660674175fc38adc9a3d232e619cd856034b875.zip |
Fix inadvertent tqt changes.
(cherry picked from commit ffc74f031874e3823f212e40a03cb9f25091cb5f)
Diffstat (limited to 'buildtools/qmake/projectconfigurationdlg.cpp')
-rw-r--r-- | buildtools/qmake/projectconfigurationdlg.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/buildtools/qmake/projectconfigurationdlg.cpp b/buildtools/qmake/projectconfigurationdlg.cpp index b625f821..e5e80b2e 100644 --- a/buildtools/qmake/projectconfigurationdlg.cpp +++ b/buildtools/qmake/projectconfigurationdlg.cpp @@ -109,8 +109,8 @@ ProjectConfigurationDlg::ProjectConfigurationDlg( TQListView *_prjList, TrollPro TQRegExp( "\\d+(\\.\\d+)?(\\.\\d+)" ), TQT_TQOBJECT(this) ) ); customVariables->setSortColumn(0); customVariables->setSortOrder(TQt::Ascending); - tqmocdir_url->completionObject()->setMode(KURLCompletion::DirCompletion); - tqmocdir_url->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); + mocdir_url->completionObject()->setMode(KURLCompletion::DirCompletion); + mocdir_url->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); objdir_url->completionObject()->setMode(KURLCompletion::DirCompletion); objdir_url->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); rccdir_url->completionObject()->setMode(KURLCompletion::DirCompletion); @@ -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( "QMOC_DIR", TQStringList( tqmocdir_url->url() ) ); + myProjectItem->scope->setEqualOp( "QMOC_DIR", TQStringList( mocdir_url->url() ) ); myProjectItem->scope->setEqualOp( "RCC_DIR", TQStringList( rccdir_url->url() ) ); //CORBA @@ -974,14 +974,14 @@ void ProjectConfigurationDlg::updateControls() dir = myProjectItem->scope->variableValues( "QMOC_DIR" ).front(); if( TQFileInfo(dir).isRelative() ) { - tqmocdir_url->completionObject()->setDir( myProjectItem->scope->projectDir() ); - tqmocdir_url->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) ); + mocdir_url->completionObject()->setDir( myProjectItem->scope->projectDir() ); + mocdir_url->fileDialog()->setURL( KURL( myProjectItem->scope->projectDir()+"/"+dir ) ); }else { - tqmocdir_url->completionObject()->setDir( dir ); - tqmocdir_url->fileDialog()->setURL( KURL( dir ) ); + mocdir_url->completionObject()->setDir( dir ); + mocdir_url->fileDialog()->setURL( KURL( dir ) ); } - tqmocdir_url->setURL( dir ); + mocdir_url->setURL( dir ); dir = myProjectItem->scope->variableValues( "RC_DIR" ).front(); if( TQFileInfo(dir).isRelative() ) { |