[licq-im/licq] 3ef4f3: qt4-gui: Add missing #ifdef around variable usage

GitHub <[email protected]> Fri, 20 Sep 2013 08:01:54 -0700

Newsgroups	gmane.network.licq.cvs
Message-ID	<523c63626d289_26417fdd48111826@hookshot-fe2-pe1-prd.aws.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/licq-im/licq
  Commit: 3ef4f30c516f4be573ca260a24c7443af90577f2
      https://github.com/licq-im/licq/commit/3ef4f30c516f4be573ca260a24c7443af90577f2
  Author: Anders Olofsson <[email protected]>
  Date:   2013-09-19 (Thu, 19 Sep 2013)

  Changed paths:
    M qt4-gui/src/core/licqgui.cpp
    M qt4-gui/src/core/licqgui.h

  Log Message:
  -----------
  qt4-gui: Add missing #ifdef around variable usage

Fixes #35


  Commit: 14fae0efef7af0d1dcc508ab93087fd88dc6f729
      https://github.com/licq-im/licq/commit/14fae0efef7af0d1dcc508ab93087fd88dc6f729
  Author: Anders Olofsson <[email protected]>
  Date:   2013-09-19 (Thu, 19 Sep 2013)

  Changed paths:
    M qt4-gui/src/core/licqgui.cpp
    M qt4-gui/src/core/licqgui.h

  Log Message:
  -----------
  qt4-gui: Remove #ifdef around slot declaration

It seems moc doesn't parse the #ifdef and assumes the slot always
exists.

Fixes #36


  Commit: 6b5f463697739be42948a052a03cc706f06c2150
      https://github.com/licq-im/licq/commit/6b5f463697739be42948a052a03cc706f06c2150
  Author: Anders Olofsson <[email protected]>
  Date:   2013-09-19 (Thu, 19 Sep 2013)

  Changed paths:
    M licq/src/socket.cpp

  Log Message:
  -----------
  core: Workaround defines in socks.h

socks.h defines send to Rsend which also affected the name of
TCPSocket::send().

Fixes Gentoo bug 484706


  Commit: 78164a77922dea56aa2b495fb5ef3b83ddf580fd
      https://github.com/licq-im/licq/commit/78164a77922dea56aa2b495fb5ef3b83ddf580fd
  Author: Anders Olofsson <[email protected]>
  Date:   2013-09-20 (Fri, 20 Sep 2013)

  Changed paths:
    M licq/src/socket.cpp
    M qt4-gui/src/core/licqgui.cpp
    M qt4-gui/src/core/licqgui.h

  Log Message:
  -----------
  Merge branch '1.8-stable'


Compare: https://github.com/licq-im/licq/compare/ab96192a4da7...78164a77922d

-- 

--- 
You received this message because you are subscribed to the Google Groups "Licq Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.