diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-06 11:37:15 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-06 11:37:15 (GMT) |
| commit | f577abca43ec341ac4b96d5a9fb6fcfdc7411965 (patch) | |
| tree | 0df451f4de071f2e055cd3850a1513ef9ecab2e0 /qmake/project.cpp | |
| parent | 31f4e677256487e7d167517ffd5dd4bef6bb4dd4 (diff) | |
| parent | 1b7d4d29d970405d5559c5641260ea1f09375b27 (diff) | |
| download | Qt-f577abca43ec341ac4b96d5a9fb6fcfdc7411965.zip Qt-f577abca43ec341ac4b96d5a9fb6fcfdc7411965.tar.gz Qt-f577abca43ec341ac4b96d5a9fb6fcfdc7411965.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'qmake/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index e118c6f..6bb8b2c 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -704,10 +704,6 @@ QStringList qmake_feature_paths(QMakeProperty *prop=0) concat << base_concat + QDir::separator() + "mac"; concat << base_concat + QDir::separator() + "mac9"; break; - case Option::TARG_QNX6_MODE: //also a unix - concat << base_concat + QDir::separator() + "qnx6"; - concat << base_concat + QDir::separator() + "unix"; - break; } concat << base_concat; } @@ -1706,13 +1702,11 @@ QMakeProject::isActiveConfig(const QString &x, bool regex, QMap<QString, QString return true; //mkspecs - if((Option::target_mode == Option::TARG_MACX_MODE || Option::target_mode == Option::TARG_QNX6_MODE || + if((Option::target_mode == Option::TARG_MACX_MODE || Option::target_mode == Option::TARG_UNIX_MODE) && x == "unix") return !isForSymbian(); else if(Option::target_mode == Option::TARG_MACX_MODE && x == "macx") return !isForSymbian(); - else if(Option::target_mode == Option::TARG_QNX6_MODE && x == "qnx6") - return !isForSymbian(); else if(Option::target_mode == Option::TARG_MAC9_MODE && x == "mac9") return !isForSymbian(); else if((Option::target_mode == Option::TARG_MAC9_MODE || Option::target_mode == Option::TARG_MACX_MODE) && @@ -3260,9 +3254,9 @@ QStringList &QMakeProject::values(const QString &_var, QMap<QString, QStringList ret = "Windows"; } else if(type == "name") { DWORD name_length = 1024; - TCHAR name[1024]; - if(GetComputerName(name, &name_length)) - ret = QString::fromUtf16((ushort*)name, name_length); + wchar_t name[1024]; + if (GetComputerName(name, &name_length)) + ret = QString::fromWCharArray(name); } else if(type == "version" || type == "version_string") { QSysInfo::WinVersion ver = QSysInfo::WindowsVersion; if(type == "version") |