diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-21 13:38:34 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-21 13:38:34 -0500 |
| commit | ffc74f031874e3823f212e40a03cb9f25091cb5f (patch) | |
| tree | 8fee0733f8a83b667665175fabc47269cb093a7c /buildtools | |
| parent | 70a3c0d90bf27c502ec710042250d51e2eb8bd99 (diff) | |
| download | tdevelop-ffc74f031874e3823f212e40a03cb9f25091cb5f.tar.gz tdevelop-ffc74f031874e3823f212e40a03cb9f25091cb5f.zip | |
Fix inadvertent tqt changes.
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/autotools/autosubprojectview.cpp | 2 | ||||
| -rw-r--r-- | buildtools/qmake/projectconfigurationdlg.cpp | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp index 71005417..35747807 100644 --- a/buildtools/autotools/autosubprojectview.cpp +++ b/buildtools/autotools/autosubprojectview.cpp @@ -230,7 +230,7 @@ void AutoSubprojectView::initActions() TQT_SLOT( slotForceReeditSubproject() ), actions, "force-reedit subproject" ); forceReeditSubprojectAction->setWhatsThis(i18n("<qt><b>Force Reedit</b><p>Runs <b>make force-reedit</b> " "from the directory of the selected subproject.<br>This " - "recreates makefile (tip: and solves most of .tqmoc related " + "recreates makefile (tip: and solves most of .moc related " "problems)<br>Environment variables and make arguments can " "be specified in the project settings dialog, " "<b>Make Options</b> tab.</qt>")); 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() ) { |