From e19fa8063e170666c3d8a291d23d7e2d46428b42 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Sun, 25 Mar 2012 21:27:49 +0000
Subject: Give qmake a VERSION it will accept.

svn path=/trunk/; revision=41762
---
 Makefile.nmake | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'Makefile.nmake')

diff --git a/Makefile.nmake b/Makefile.nmake
index 47cac08815..371092770e 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -423,7 +423,9 @@ config.h	: config.h.win32 config.nmake
 ui\qt\config.pri: config.nmake Makefile.nmake
 	@echo Creating <<ui\qt\config.pri
 # Automatically generated from Makefile.nmake. Edit there, not here.
-VERSION = $(VERSION)
+# qmake apparently requires a three-part numeric VERSION.
+VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO)
+VERSION_FULL = $(VERSION)
 !IFDEF MANIFEST_INFO_REQUIRED
 CONFIG += wireshark_manifest_info_required
 !ENDIF
-- 
cgit v1.2.3