diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-09-18 23:43:22 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-09-18 23:43:22 +0000 |
| commit | 39f1ae114d5b5122527fbfc321d8087c474e02de (patch) | |
| tree | ebb27a998654c732a87577e0ce7dd6545fe56982 /buildtools/qmake/trollprojectwidget.cpp | |
| parent | 2ea0370d7988cd1a77a00bdeb1ccd2f35ef2da77 (diff) | |
| download | tdevelop-39f1ae114d5b5122527fbfc321d8087c474e02de.tar.gz tdevelop-39f1ae114d5b5122527fbfc321d8087c474e02de.zip | |
Fix a number of strings in Trinity that were incorrectly converted to TQ* from Q*
This fixes the Kopete MSN protocol among other things
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1254372 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'buildtools/qmake/trollprojectwidget.cpp')
| -rw-r--r-- | buildtools/qmake/trollprojectwidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index e4294f0a..ad57b792 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 == "TQTDIR" ) + if( (*it).first == "QTDIR" ) 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["TQTDIR="] = DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", ""); + map["QTDIR="] = DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", ""); map["PATH"] = map["PATH"].prepend( DomUtil::readEntry(*m_part->projectDom(), "/kdevcppsupport/qt/root", "") +"/bin" ); } return map; |