0253-qmake_correct_path_separators.diff

   1 qt-bugs@ issue : none
   2 Trolltech task ID : 214661
   3 applied: no
   4 author: Christian Ehrlicher <ch.ehrlicher@gmx.de>
   5
   6 When using qmake outside qt src tree, it sometimes generates wrong
   7 paths (wrong path separator)
   8
   9
  10 --- qmake/property.cpp.orig     2008-05-08 21:16:15.902625000 +0200
  11 +++ qmake/property.cpp  2008-05-08 21:16:10.481500000 +0200
  12 @@ -83,29 +83,32 @@
  13  QString
  14  QMakeProperty::value(QString v, bool just_check)
  15  {
  16 +    QString ret;
  17      if(v == "QT_INSTALL_PREFIX")
  18 -        return QLibraryInfo::location(QLibraryInfo::PrefixPath);
  19 +        ret = QLibraryInfo::location(QLibraryInfo::PrefixPath);
  20      else if(v == "QT_INSTALL_DATA")
  21 -        return QLibraryInfo::location(QLibraryInfo::DataPath);
  22 +        ret = QLibraryInfo::location(QLibraryInfo::DataPath);
  23      else if(v == "QT_INSTALL_DOCS")
  24 -        return QLibraryInfo::location(QLibraryInfo::DocumentationPath);
  25 +        ret = QLibraryInfo::location(QLibraryInfo::DocumentationPath);
  26      else if(v == "QT_INSTALL_HEADERS")
  27 -        return QLibraryInfo::location(QLibraryInfo::HeadersPath);
  28 +        ret = QLibraryInfo::location(QLibraryInfo::HeadersPath);
  29      else if(v == "QT_INSTALL_LIBS")
  30 -        return QLibraryInfo::location(QLibraryInfo::LibrariesPath);
  31 +        ret = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
  32      else if(v == "QT_INSTALL_BINS")
  33 -        return QLibraryInfo::location(QLibraryInfo::BinariesPath);
  34 +        ret = QLibraryInfo::location(QLibraryInfo::BinariesPath);
  35      else if(v == "QT_INSTALL_PLUGINS")
  36 -        return QLibraryInfo::location(QLibraryInfo::PluginsPath);
  37 +        ret = QLibraryInfo::location(QLibraryInfo::PluginsPath);
  38      else if(v == "QT_INSTALL_TRANSLATIONS")
  39 -        return QLibraryInfo::location(QLibraryInfo::TranslationsPath);
  40 +        ret = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
  41      else if(v == "QT_INSTALL_CONFIGURATION")
  42 -        return QLibraryInfo::location(QLibraryInfo::SettingsPath);
  43 +        ret = QLibraryInfo::location(QLibraryInfo::SettingsPath);
  44      else if(v == "QT_INSTALL_EXAMPLES")
  45 -        return QLibraryInfo::location(QLibraryInfo::ExamplesPath);
  46 +        ret = QLibraryInfo::location(QLibraryInfo::ExamplesPath);
  47      else if(v == "QT_INSTALL_DEMOS")
  48 -        return QLibraryInfo::location(QLibraryInfo::DemosPath);
  49 -    else if(v == "QMAKE_MKSPECS")
  50 +        ret = QLibraryInfo::location(QLibraryInfo::DemosPath);
  51 +    if(!ret.isEmpty())
  52 +        return QDir::toNativeSeparators(ret);
  53 +    if(v == "QMAKE_MKSPECS")
  54          return qmake_mkspec_paths().join(Option::target_mode == Option::TARG_WIN_MODE ? ";" : ":");
  55      else if(v == "QMAKE_VERSION")
  56          return qmake_version();
  57 @@ -118,7 +121,7 @@
  58      int slash = v.lastIndexOf('/');
  59      QVariant var = settings->value(keyBase(slash == -1) + v);
  60      bool ok = var.isValid();
  61 -    QString ret = var.toString();
  62 +    ret = var.toString();
  63      if(!ok) {
  64          QString version = qmake_version();
  65          if(slash != -1) {