Ticket #48252: patch-for-10.11.diff

File patch-for-10.11.diff, 2.4 KB (added by RJVB (René Bertin), 9 years ago)

  • qtbase/src/plugins/platforms/cocoa/qcocoacursor.mm 

    Change-Id: I91831390e9e0d97ab28f0e34ca0573fb2c84e954
Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
diff --git a/qtbase/src/plugins/platforms/cocoa/qcocoacursor.mm b/qtbase/src/plugins/platforms/cocoa/qcocoacursor.mm
index 06e957c..922809f 100644
    a b void QCocoaCursor::setPos(const QPoint &position) 
    7373    pos.x = position.x();
    7474    pos.y = position.y();
    7575
    76     CGEventRef e = CGEventCreateMouseEvent(0, kCGEventMouseMoved, pos, 0);
     76    CGEventRef e = CGEventCreateMouseEvent(0, kCGEventMouseMoved, pos, kCGMouseButtonLeft);
    7777    CGEventPost(kCGHIDEventTap, e);
    7878    CFRelease(e);
    7979}

  • qtbase/src/tools/qlalr/lalr.cpp 

    Change-Id: I0c838dac872ca2c00bf57c95df17d24edb48007b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
diff --git a/qtbase/src/tools/qlalr/lalr.cpp b/qtbase/src/tools/qlalr/lalr.cpp
index 3d0d5de..3d780cd 100644
    a b void Grammar::buildExtendedGrammar () 
    238238  non_terminals.insert (accept_symbol);
    239239}
    240240
    241 struct _Nullable: public std::unary_function<Name, bool>
     241struct Nullable: public std::unary_function<Name, bool>
    242242{
    243243  Automaton *_M_automaton;
    244244
    245   _Nullable (Automaton *aut):
     245  Nullable (Automaton *aut):
    246246    _M_automaton (aut) {}
    247247
    248248  bool operator () (Name name) const
    … … void Automaton::buildNullables () 
    300300
    301301      for (RulePointer rule = _M_grammar->rules.begin (); rule != _M_grammar->rules.end (); ++rule)
    302302        {
    303           NameList::iterator nn = std::find_if (rule->rhs.begin (), rule->rhs.end (), std::not1 (_Nullable (this)));
     303          NameList::iterator nn = std::find_if (rule->rhs.begin (), rule->rhs.end (), std::not1 (Nullable (this)));
    304304
    305305          if (nn == rule->rhs.end ())
    306306            changed |= nullables.insert (rule->lhs).second;
    … … void Automaton::buildIncludesDigraph () 
    635635                  if (! _M_grammar->isNonTerminal (*A))
    636636                    continue;
    637637
    638                   NameList::iterator first_not_nullable = std::find_if (dot, rule->rhs.end (), std::not1 (_Nullable (this)));
     638                  NameList::iterator first_not_nullable = std::find_if (dot, rule->rhs.end (), std::not1 (Nullable (this)));
    639639                  if (first_not_nullable != rule->rhs.end ())
    640640                    continue;
    641641