Compilation failure with head and Qt 4.8.4

[GoogleCodeExporter]

What steps will reproduce the problem?
1. Clone
2. Configure
3. Compile with Qt 4.8.4

What is the expected output? What do you see instead?

I expect it to compile, instead I see,

src/Version.cpp: In constructor 'VersionPrivate::VersionPrivate()':
src/Version.cpp:29:11: error: class 'VersionPrivate' does not have any field 
named 'gnu_dev_major'
src/Version.cpp:29:25: error: class 'VersionPrivate' does not have any field 
named 'gnu_dev_minor'
src/Version.cpp: In constructor 'VersionPrivate::VersionPrivate(int, int, int)':
src/Version.cpp:33:11: error: class 'VersionPrivate' does not have any field 
named 'gnu_dev_major'
src/Version.cpp:33:28: error: class 'VersionPrivate' does not have any field 
named 'gnu_dev_minor'

What version of the product are you using? On what operating system?

Git SHA 49c2630c, Arch Linux with GCC 4.7.2 and Qt 4.8.4.

Please provide any additional information below.

Original issue reported on code.google.com by marcus.h...@kitware.com on 29 Jan 2013 at 7:27

[GoogleCodeExporter]

I can reproduce this.

Archlinux, GCC 4.8.1, QT 4.8.5.

Original comment by clemens-...@gmx.de on 2 Sep 2013 at 6:53

[GoogleCodeExporter]

quick hack which works-for-me

diff --git a/src/Utils/src/Version.cpp b/src/Utils/src/Version.cpp
index a41116b..de4b2de 100644
--- a/src/Utils/src/Version.cpp
+++ b/src/Utils/src/Version.cpp
@@ -18,10 +18,14 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */

-#include <QtCore/QString>
 #include <QtCore/QRegExp>
 #include "Version.h"

+// see https://bugzilla.redhat.com/show_bug.cgi?id=130601
+#undef major
+#undef minor
+#undef subminor
+
 class VersionPrivate
 {
 public:

Original comment by yarpe...@gmail.com on 7 Jan 2014 at 9:20