--- option.cpp.orig 2010-12-09 16:47:54 +0800 +++ option.cpp 2010-12-09 16:51:56 +0800 @@ -532,6 +532,7 @@ #endif } } else if (Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT) { +#if 0 #if defined(Q_OS_MAC) Option::host_mode = Option::HOST_MACX_MODE; Option::target_mode = Option::TARG_MACX_MODE; @@ -542,7 +543,11 @@ Option::host_mode = Option::HOST_WIN_MODE; Option::target_mode = Option::TARG_WIN_MODE; #endif +#endif } + // cross-compiling for unix always. host_mode affects output too. + Option::host_mode = Option::HOST_UNIX_MODE; + Option::target_mode = Option::TARG_UNIX_MODE; //defaults for globals if (Option::host_mode != Option::HOST_UNKNOWN_MODE) @@ -654,11 +659,11 @@ //fix separators Q_ASSERT(!((flags & Option::FixPathToLocalSeparators) && (flags & Option::FixPathToTargetSeparators))); if(flags & Option::FixPathToLocalSeparators) { -#if defined(Q_OS_WIN32) - string = string.replace('/', '\\'); -#else +//#if defined(Q_OS_WIN32) +// string = string.replace('/', '\\'); +//#else string = string.replace('\\', '/'); -#endif +//#endif } else if(flags & Option::FixPathToTargetSeparators) { string = string.replace('/', Option::dir_sep).replace('\\', Option::dir_sep); }