Changeset 1000

Legend:

Unmodified

Added

Removed

• trunk/qmake/generators/os2/gnumake.cpp

  r999	r1000
  75	75	if (!ret.isEmpty() && !ret.contains(QRegExp("\\$\\(([^$)]+)\\)"))) {
  76	76	ret = unescapeFilePath(ret);
  77	(追記) // fix separators and remove the trailing slahsh (if any) since ancient (追記ここまで)
  78	(追記) // tools such as CMD.EXE (e.g. its "cd" command) don't like them (追記ここまで)
  79	(追記) ret = Option::fixPathToTargetOS(ret, false); (追記ここまで)
  77	80	if (!isDosLikeShell()) {
  78	(削除) ret.replace('\\', '/'); (削除ここまで)
  79	81	ret.replace(' ', "\\ ");
  80	82	} else {
  81	ret.replace('/', '\\');
  82	// Note: also quote paths ending with the backslash to avoid
  83	// interpreting it as a linebreak
  84	if (ret.contains(QRegExp("[ +&;%]")) || ret.endsWith('\\'))
  83	if (ret.contains(QRegExp("[ +&;%]")))
  85	84	ret = quote + ret + quote;
  86	85	}
  …	…
  107	106	// and we still want to normalize slashes as this is what we do in
  108	107	// other places (e.g. .cpp targets); this function will do it for
  109	// QMAKE_EXTRA_TARGETS as well
  110	if (!isDosLikeShell())
  111	ret.replace('\\', '/');
  112	else
  113	ret.replace('/', '\\');
  108	// QMAKE_EXTRA_TARGETS as well (this will also remove the trailing
  109	// slash, if any, see above)
  110	ret = Option::fixPathToTargetOS(ret, false);
  114	111	}
  115	112	}

Note: See TracChangeset for help on using the changeset viewer.