diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-06 14:37:15 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-06 14:37:15 +0300 |
| commit | f577abca43ec341ac4b96d5a9fb6fcfdc7411965 (patch) | |
| tree | 0df451f4de071f2e055cd3850a1513ef9ecab2e0 /qmake/option.cpp | |
| parent | 31f4e677256487e7d167517ffd5dd4bef6bb4dd4 (diff) | |
| parent | 1b7d4d29d970405d5559c5641260ea1f09375b27 (diff) | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'qmake/option.cpp')
| -rw-r--r-- | qmake/option.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp index 7f3e25058d..6ec61ec817 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -100,8 +100,6 @@ QStringList Option::shellPath; Option::TARG_MODE Option::target_mode = Option::TARG_WIN_MODE; #elif defined(Q_OS_MAC) Option::TARG_MODE Option::target_mode = Option::TARG_MACX_MODE; -#elif defined(Q_OS_QNX6) -Option::TARG_MODE Option::target_mode = Option::TARG_QNX6_MODE; #else Option::TARG_MODE Option::target_mode = Option::TARG_UNIX_MODE; #endif @@ -718,16 +716,9 @@ QString qmake_libraryInfoFile() { QString ret; #if defined( Q_OS_WIN ) - QFileInfo filePath; - QT_WA({ - unsigned short module_name[256]; - GetModuleFileNameW(0, reinterpret_cast<wchar_t *>(module_name), sizeof(module_name)); - filePath = QString::fromUtf16(module_name); - }, { - char module_name[256]; - GetModuleFileNameA(0, module_name, sizeof(module_name)); - filePath = QString::fromLocal8Bit(module_name); - }); + wchar_t module_name[MAX_PATH]; + GetModuleFileName(0, module_name, MAX_PATH); + QFileInfo filePath = QString::fromWCharArray(module_name); ret = filePath.filePath(); #else QString argv0 = QFile::decodeName(QByteArray(Option::application_argv0)); |