diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-14 16:45:05 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-14 16:45:05 +0000 |
commit | 48d4a26399959121f33d2bc3bfe51c7827b654fc (patch) | |
tree | 5ae5e6e00d3ba330b7b8be9bc097154b6bc739e8 /languages/cpp/main.cpp | |
parent | 7e701ace6592d09e1f2c0cf28c7d6d872d78f4f5 (diff) | |
download | tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.tar.gz tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.zip |
TQt4 port kdevelop
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'languages/cpp/main.cpp')
-rw-r--r-- | languages/cpp/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/languages/cpp/main.cpp b/languages/cpp/main.cpp index b3e6bacb..b29fe2d4 100644 --- a/languages/cpp/main.cpp +++ b/languages/cpp/main.cpp @@ -86,11 +86,11 @@ public: if ( !kdedir.isNull() ) addIncludePath( kdedir + "/include" ); - TQString qtdir = getenv( "QTDIR" ); + TQString qtdir = getenv( "TQTDIR" ); if ( !qtdir.isNull() ) addIncludePath( qtdir + "/include" ); - TQString qmakespec = getenv( "QMAKESPEC" ); + TQString qmakespec = getenv( "TQMAKESPEC" ); if ( qmakespec.isNull() ) qmakespec = "linux-g++"; // #### implement other mkspecs and find a better way to find the @@ -107,7 +107,7 @@ public: TQString gccLibPath = SetupHelper::getGccIncludePath(&ok); if (!ok) return; - gccLibPath = gccLibPath.replace( TQRegExp( "[\r\n]" ), "" ); + gccLibPath = gccLibPath.tqreplace( TQRegExp( "[\r\n]" ), "" ); addIncludePath( gccLibPath ); addIncludePath( "/usr/include/g++-3" ); addIncludePath( "/usr/include/g++" ); |