Uploaded image for project: 'Qt'
  1. Qt
  2. QTBUG-28624

no HEX-Values for RC_LANG and RC_CODEPAGE

    XMLWordPrintable

    Details

    • Type: Suggestion
    • Status: Closed
    • Priority: P4: Low
    • Resolution: Done
    • Affects Version/s: 4.8.4
    • Fix Version/s: 4.8.5, 5.0.1
    • Component/s: Build tools: qmake
    • Labels:
      None
    • Commits:
      f0f12ea5f1b6fdaf3e2e38bf8d814dfa41cbca5b (5.0.1), 0deddff9c8ca7e1a1e9288a09bc015fd7ea0fd03 (4.8.5)

      Description

      While fixing QTBUG-23218 there was introduced a function called "intValue" in
      class QMakeProject to read the values for RC_LANG and RC_CODEPAGE from the .pro-file.
      Unfortunately this didnt allow hex-Values for these entries.
      This patch will bring back that functionality

      --- d:\qt\4.8.4.org\qmake\project.h	2012-11-23 12:11:22.000000000 +0100
      +++ d:\qt\4.8.4\qmake\project.h	2012-12-12 15:07:56.000000000 +0100
      @@ -191,19 +191,19 @@
       
       inline int QMakeProject::intValue(const QString &v, int defaultValue)
       {
           const QString str = first(v);
           if (!str.isEmpty()) {
               bool ok;
      -        int i = str.toInt(&ok);
      +        int i = str.toInt(&ok,0);
               if (ok)
                   return i;
           }
           return defaultValue;
       }
       
       inline QMap<QString, QStringList> &QMakeProject::variables()
       { return vars; }
       
       QT_END_NAMESPACE
       
       #endif // PROJECT_H
      

        Attachments

        No reviews matched the request. Check your Options in the drop-down menu of this sections header.

          Activity

            People

            Assignee:
            jbornema Joerg Bornemann
            Reporter:
            gerd Gerhard Kokerbeck
            Votes:
            0 Vote for this issue
            Watchers:
            5 Start watching this issue

              Dates

              Created:
              Updated:
              Resolved:

                Gerrit Reviews

                There are no open Gerrit changes