diff options
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefile.cpp | 12 | ||||
| -rw-r--r-- | qmake/main.cpp | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index d11243728..f31c7e085 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -648,7 +648,7 @@ MakefileGenerator::initOutPaths() for(int x = 0; dirs[x] != TQString::null; x++) { if ( !v[dirs[x]].isEmpty() ) { TQString orig_path = v[dirs[x]].first(); -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN // We don't want to add a separator for DLLDESTDIR on Windows if (!(dirs[x] == "DLLDESTDIR")) #endif @@ -671,7 +671,7 @@ MakefileGenerator::initOutPaths() d.cd(Option::dir_sep); path = path.right(path.length() - 1); } -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN bool driveExists = TRUE; if ( !TQDir::isRelativePath( path ) ) { if ( TQFile::exists( path.left( 3 ) ) ) { @@ -698,7 +698,7 @@ MakefileGenerator::initOutPaths() } } } -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN } #endif } @@ -1885,7 +1885,7 @@ MakefileGenerator::writeInstalls(TQTextStream &t, const TQString &installs) if(!uninst.isEmpty()) uninst.append("\n\t"); uninst.append( -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN TQString("-$(DEL_FILE)") #else TQString("-$(DEL_FILE) -r") @@ -1902,7 +1902,7 @@ MakefileGenerator::writeInstalls(TQTextStream &t, const TQString &installs) if(!uninst.isEmpty()) uninst.append("\n\t"); uninst.append( -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN TQString("-$(DEL_FILE)") #else TQString("-$(DEL_FILE) -r") @@ -1946,7 +1946,7 @@ MakefileGenerator::writeInstalls(TQTextStream &t, const TQString &installs) const TQStringList &dirs = project->variables()[pvar]; for(TQStringList::ConstIterator pit = dirs.begin(); pit != dirs.end(); ++pit) { TQString tmp_dst = fileFixify((*pit)); -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN if(tmp_dst.right(1) != Option::dir_sep) tmp_dst += Option::dir_sep; #endif diff --git a/qmake/main.cpp b/qmake/main.cpp index 379f949b4..2371db7ad 100644 --- a/qmake/main.cpp +++ b/qmake/main.cpp @@ -57,13 +57,13 @@ bool tqt_resolve_symlinks = FALSE; #endif -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) extern TQ_EXPORT int qt_ntfs_permission_lookup; #endif int main(int argc, char **argv) { -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) // Workaround for TQFileInfo::isReadable() failing for certain users. See task: 54320 qt_ntfs_permission_lookup = 0; #endif @@ -74,7 +74,7 @@ int main(int argc, char **argv) TQDir sunworkshop42workaround = TQDir::current(); TQString oldpwd = sunworkshop42workaround.currentDirPath(); -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN if(!(oldpwd.length() == 3 && oldpwd[0].isLetter() && oldpwd.endsWith(":/") ) ) #endif { |