diff options
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/qmake/trollprojectpart.cpp | 8 | ||||
| -rw-r--r-- | buildtools/qmake/trollprojectwidget.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index eeccf445..6d92d03b 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -246,7 +246,7 @@ TQString TrollProjectPart::makeEnvironment() DomUtil::PairList::ConstIterator it; bool hasTQtDir = false; for (it = envvars.begin(); it != envvars.end(); ++it) { - if( (*it).first == "QTDIR" ) + if( (*it).first == "TQTDIR" ) hasTQtDir = true; environstr += (*it).first; @@ -257,7 +257,7 @@ TQString TrollProjectPart::makeEnvironment() if( !hasTQtDir && !isTQt4Project() && !DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "").isEmpty() ) { - environstr += TQString( "QTDIR=" ) + EnvVarTools::quote( DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "") ) + TQString( " PATH=$TQTDIR/bin:$PATH " ); + environstr += TQString( "TQTDIR=" ) + EnvVarTools::quote( DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", "") ) + TQString( " PATH=$TQTDIR/bin:$PATH " ); } TDEConfigGroup grp( kapp->config(), "MakeOutputView" ); @@ -808,7 +808,7 @@ void TrollProjectPart::buildBinDirs( TQStringList & dirs ) const TQString m_defaultTQtDir = DomUtil::readEntry(*projectDom(), "/kdevcppsupport/qt/root", ""); if( !m_defaultTQtDir.isEmpty() ) dirs << (m_defaultTQtDir + TQString( TQChar( TQDir::separator() ) ) + "bin" ); - dirs << ( ::getenv("QTDIR") + TQString( TQChar( TQDir::separator() ) ) + "bin" ); + dirs << ( ::getenv("TQTDIR") + TQString( TQChar( TQDir::separator() ) ) + "bin" ); } TQStringList paths = TQStringList::split(":",::getenv("PATH")); dirs += paths; @@ -851,7 +851,7 @@ TQString TrollProjectPart::findTQtDir() { TQStringList qtdirs; if( !isTQt4Project() ) - qtdirs.push_back( ::getenv("QTDIR") ); + qtdirs.push_back( ::getenv("TQTDIR") ); qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"lib"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString( TQChar( TQDir::separator() ) )+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); qtdirs.push_back( TQDir::rootDirPath()+"usr"+TQString( TQChar( TQDir::separator() ) )+"share"+TQString( TQChar( TQDir::separator() ) )+"qt"+TQString("%1").arg( DomUtil::readEntry( *projectDom(), "/kdevcppsupport/qt/version", "3") ) ); diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index 8a5fd12b..79077bac 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -2527,7 +2527,7 @@ TQMap<TQString,TQString> TrollProjectWidget::qmakeEnvironment() const DomUtil::PairList::ConstIterator it; bool hasTQtDir = false; for (it = envvars.begin(); it != envvars.end(); ++it) { - if( (*it).first == "QTDIR" ) + if( (*it).first == "TQTDIR" ) hasTQtDir = true; map[(*it).first] = (*it).second; @@ -2535,7 +2535,7 @@ TQMap<TQString,TQString> TrollProjectWidget::qmakeEnvironment() const if( !hasTQtDir && !m_part->isTQt4Project() && !DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", "").isEmpty() ) { - map["QTDIR="] = DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", ""); + map["TQTDIR="] = DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", ""); map["PATH"] = map["PATH"].prepend( DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", "") +"/bin" ); } return map; |