fixed win sdk v7.1A paths.

cristian-anita · cristian-anita · commit 19c9c2184e66 · 2018-01-10T01:47:03.000+02:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,10 +1,3 @@
-Version 1.0.7.1:
-- Release date:
-- New features:
-- Improvements:
-- Fixed bugs:
-
-
 Version 1.0.6.1:
 - Release date: 7 Jan 2018
 - New features:
diff --git a/Doxyfile b/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = CppDevTk
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.0.7
+PROJECT_NUMBER         = 1.0.6
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/common.pri b/common.pri
@@ -58,7 +58,7 @@ else {
 # version
 CPPDEVTK_VERSION_MAJOR = 1
 CPPDEVTK_VERSION_MINOR = 0
-CPPDEVTK_VERSION_PATCH = 7
+CPPDEVTK_VERSION_PATCH = 6
 win32 {
 	CPPDEVTK_VERSION_BUILD = 1
 }
@@ -612,16 +612,16 @@ else {
 				error("Qt must set _MSC_VER in QMAKE_COMPILER_DEFINES")
 			}
 			if(isEqual(CPPDEVTK_MSC_VER, "1700")|greaterThan(CPPDEVTK_MSC_VER, 1700)):contains(DEFINES, _USING_V110_SDK71_) {
-				INCLUDEPATH = "C:/Program Files (x86)/Microsoft SDKs/Windows/7.1A/Include" $${INCLUDEPATH}
+				INCLUDEPATH = "C:/Program Files (x86)/Microsoft SDKs/Windows/v7.1A/Include" $${INCLUDEPATH}
 				isEqual(QMAKE_TARGET.arch, "x86_64") {
 					QMAKE_LFLAGS_WINDOWS *= /SUBSYSTEM:WINDOWS,5.02
 					QMAKE_LFLAGS_CONSOLE *= /SUBSYSTEM:CONSOLE,5.02
-					LIBS = -L"C:/Program Files (x86)/Microsoft SDKs/Windows/7.1A/Lib/x64" $${LIBS}
+					LIBS = -L"C:/Program Files (x86)/Microsoft SDKs/Windows/v7.1A/Lib/x64" $${LIBS}
 				}
 				else {
 					QMAKE_LFLAGS_WINDOWS *= /SUBSYSTEM:WINDOWS,5.01
 					QMAKE_LFLAGS_CONSOLE *= /SUBSYSTEM:CONSOLE,5.01
-					LIBS = -L"C:/Program Files (x86)/Microsoft SDKs/Windows/7.1A/Lib" $${LIBS}
+					LIBS = -L"C:/Program Files (x86)/Microsoft SDKs/Windows/v7.1A/Lib" $${LIBS}
 				}
 			}
 		}
diff --git a/cppdevtk.spec b/cppdevtk.spec
@@ -77,7 +77,7 @@
 
 
 Name: cppdevtk
-Version: 1.0.7
+Version: 1.0.6
 %if (0%{?centos} || 0%{?rhel})
 Release: 1.el%{rhel}_%{centos_minor_ver}
 %else
@@ -591,9 +591,6 @@ exit 0
 
 
 %changelog
-* Mon Jan 8 2018 Cristian ANITA <cristian.anita@cososys.com>, <cristian_anita@yahoo.com>
-- v1.0.7.1
-- to fill
 * Sun Jan 7 2018 Cristian ANITA <cristian.anita@cososys.com>, <cristian_anita@yahoo.com>
 - v1.0.6.1
 - added CallTraits
diff --git a/debian/changelog b/debian/changelog
@@ -1,10 +1,3 @@
-cppdevtk (1.0.7-0ubuntu1) xenial; urgency=medium
-
-  * to fill
-
- -- Cristian ANITA <cristian.anita@cososys.com>, <cristian_anita@yahoo.com>  Mon, 8 Jan 2018 14:19:46 +0300
-
-
 cppdevtk (1.0.6-0ubuntu1) xenial; urgency=medium
 
   * added CallTraits
diff --git a/debian_distros/ubuntu_14.04/debian/changelog b/debian_distros/ubuntu_14.04/debian/changelog
@@ -1,10 +1,3 @@
-cppdevtk (1.0.7-0ubuntu1) trusty; urgency=medium
-
-  * to fill
-
- -- Cristian ANITA <cristian.anita@cososys.com>, <cristian_anita@yahoo.com>  Mon, 8 Jan 2018 14:19:46 +0300
-
-
 cppdevtk (1.0.6-0ubuntu1) trusty; urgency=medium
 
   * added CallTraits
diff --git a/doc/cppdevtk_api.chm b/doc/cppdevtk_api.chm
diff --git a/include/cppdevtk/config/product_info.hpp b/include/cppdevtk/config/product_info.hpp
@@ -43,7 +43,7 @@
 // TODO: keep updated
 #define CPPDEVTK_VERSION_MAJOR 1	///< \attention May have maximum 2 digits.
 #define CPPDEVTK_VERSION_MINOR 0	///< \attention May have maximum 2 digits.
-#define CPPDEVTK_VERSION_PATCH 7	///< \attention May have maximum 2 digits.
+#define CPPDEVTK_VERSION_PATCH 6	///< \attention May have maximum 2 digits.
 #ifdef _WIN32
 #define CPPDEVTK_VERSION_BUILD 1
 #endif
diff --git a/test/test_base/android/AndroidManifest.xml b/test/test_base/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest package="org.qtproject.example.cppdevtk_test_base" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0.7" android:versionCode="107" android:installLocation="auto">
+<manifest package="org.qtproject.example.cppdevtk_test_base" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0.6" android:versionCode="106" android:installLocation="auto">
     <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="cppdevtk_test_base">
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation"
                   android:name="org.qtproject.qt5.android.bindings.QtActivity"
diff --git a/test/test_caps_lock_widget/android/AndroidManifest.xml b/test/test_caps_lock_widget/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest package="org.qtproject.example.cppdevtk_test_caps_lock_widget" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0.7" android:versionCode="107" android:installLocation="auto">
+<manifest package="org.qtproject.example.cppdevtk_test_caps_lock_widget" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0.6" android:versionCode="106" android:installLocation="auto">
     <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="cppdevtk_test_caps_lock_widget">
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation"
                   android:name="org.qtproject.qt5.android.bindings.QtActivity"
diff --git a/test/test_caps_lock_widget/cppdevtk_test_caps_lock_widget_ios.plist b/test/test_caps_lock_widget/cppdevtk_test_caps_lock_widget_ios.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleDisplayName</key>
 	<string>CppDevTk Test Caps Lock Widget</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleGetInfoString</key>
 	<string>CppDevTk test application.</string>
 	<key>CFBundleIdentifier</key>
diff --git a/test/test_caps_lock_widget/cppdevtk_test_caps_lock_widget_ios_debug.plist b/test/test_caps_lock_widget/cppdevtk_test_caps_lock_widget_ios_debug.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleDisplayName</key>
 	<string>CppDevTk Test Caps Lock Widget Debug</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleGetInfoString</key>
 	<string>CppDevTk test application.</string>
 	<key>CFBundleIdentifier</key>
diff --git a/test/test_caps_lock_widget/cppdevtk_test_caps_lock_widget_mac.plist b/test/test_caps_lock_widget/cppdevtk_test_caps_lock_widget_mac.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleDisplayName</key>
 	<string>CppDevTk Test Caps Lock Widget</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleGetInfoString</key>
 	<string>CppDevTk test application.</string>
 	<key>CFBundleIdentifier</key>
diff --git a/test/test_caps_lock_widget/cppdevtk_test_caps_lock_widget_mac_debug.plist b/test/test_caps_lock_widget/cppdevtk_test_caps_lock_widget_mac_debug.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleDisplayName</key>
 	<string>CppDevTk Test Caps Lock Widget Debug</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleGetInfoString</key>
 	<string>CppDevTk test application.</string>
 	<key>CFBundleIdentifier</key>
diff --git a/test/test_config/android/AndroidManifest.xml b/test/test_config/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest package="org.qtproject.example.cppdevtk_test_config" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0.7" android:versionCode="107" android:installLocation="auto">
+<manifest package="org.qtproject.example.cppdevtk_test_config" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0.6" android:versionCode="106" android:installLocation="auto">
     <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="cppdevtk_test_config">
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation"
                   android:name="org.qtproject.qt5.android.bindings.QtActivity"
diff --git a/test/test_disk_space_widget/android/AndroidManifest.xml b/test/test_disk_space_widget/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest package="org.qtproject.example.cppdevtk_test_disk_space_widget" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0.7" android:versionCode="107" android:installLocation="auto">
+<manifest package="org.qtproject.example.cppdevtk_test_disk_space_widget" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0.6" android:versionCode="106" android:installLocation="auto">
     <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="cppdevtk_test_disk_space_widget">
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation"
                   android:name="org.qtproject.qt5.android.bindings.QtActivity"
diff --git a/test/test_disk_space_widget/cppdevtk_test_disk_space_widget_ios.plist b/test/test_disk_space_widget/cppdevtk_test_disk_space_widget_ios.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleDisplayName</key>
 	<string>CppDevTk Test Disk Space Widget</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleGetInfoString</key>
 	<string>CppDevTk test application.</string>
 	<key>CFBundleIdentifier</key>
diff --git a/test/test_disk_space_widget/cppdevtk_test_disk_space_widget_ios_debug.plist b/test/test_disk_space_widget/cppdevtk_test_disk_space_widget_ios_debug.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleDisplayName</key>
 	<string>CppDevTk Test Disk Space Widget Debug</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleGetInfoString</key>
 	<string>CppDevTk test application.</string>
 	<key>CFBundleIdentifier</key>
diff --git a/test/test_disk_space_widget/cppdevtk_test_disk_space_widget_mac.plist b/test/test_disk_space_widget/cppdevtk_test_disk_space_widget_mac.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleDisplayName</key>
 	<string>CppDevTk Test Disk Space Widget</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleGetInfoString</key>
 	<string>CppDevTk test application.</string>
 	<key>CFBundleIdentifier</key>
diff --git a/test/test_disk_space_widget/cppdevtk_test_disk_space_widget_mac_debug.plist b/test/test_disk_space_widget/cppdevtk_test_disk_space_widget_mac_debug.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleDisplayName</key>
 	<string>CppDevTk Test Disk Space Widget Debug</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleGetInfoString</key>
 	<string>CppDevTk test application.</string>
 	<key>CFBundleIdentifier</key>
diff --git a/test/test_invisible_widget/android/AndroidManifest.xml b/test/test_invisible_widget/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest package="org.qtproject.example.cppdevtk_test_invisible_widget" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0.7" android:versionCode="107" android:installLocation="auto">
+<manifest package="org.qtproject.example.cppdevtk_test_invisible_widget" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0.6" android:versionCode="106" android:installLocation="auto">
     <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="cppdevtk_test_invisible_widget">
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation"
                   android:name="org.qtproject.qt5.android.bindings.QtActivity"
diff --git a/test/test_invisible_widget/cppdevtk_test_invisible_widget_ios.plist b/test/test_invisible_widget/cppdevtk_test_invisible_widget_ios.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleDisplayName</key>
 	<string>CppDevTk Test Invisible Widget</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleGetInfoString</key>
 	<string>CppDevTk test application.</string>
 	<key>CFBundleIdentifier</key>
diff --git a/test/test_invisible_widget/cppdevtk_test_invisible_widget_ios_debug.plist b/test/test_invisible_widget/cppdevtk_test_invisible_widget_ios_debug.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleDisplayName</key>
 	<string>CppDevTk Test Invisible Widget Debug</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleGetInfoString</key>
 	<string>CppDevTk test application.</string>
 	<key>CFBundleIdentifier</key>
diff --git a/test/test_invisible_widget/cppdevtk_test_invisible_widget_mac.plist b/test/test_invisible_widget/cppdevtk_test_invisible_widget_mac.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleDisplayName</key>
 	<string>CppDevTk Test Invisible Widget</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleGetInfoString</key>
 	<string>CppDevTk test application.</string>
 	<key>CFBundleIdentifier</key>
diff --git a/test/test_invisible_widget/cppdevtk_test_invisible_widget_mac_debug.plist b/test/test_invisible_widget/cppdevtk_test_invisible_widget_mac_debug.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleDisplayName</key>
 	<string>CppDevTk Test Invisible Widget Debug</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleGetInfoString</key>
 	<string>CppDevTk test application.</string>
 	<key>CFBundleIdentifier</key>
diff --git a/test/test_slot_throw/android/AndroidManifest.xml b/test/test_slot_throw/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest package="org.qtproject.example.cppdevtk_test_slot_throw" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0.7" android:versionCode="107" android:installLocation="auto">
+<manifest package="org.qtproject.example.cppdevtk_test_slot_throw" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0.6" android:versionCode="106" android:installLocation="auto">
     <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="cppdevtk_test_slot_throw">
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation"
                   android:name="org.qtproject.qt5.android.bindings.QtActivity"
diff --git a/test/test_slot_throw/cppdevtk_test_slot_throw_ios.plist b/test/test_slot_throw/cppdevtk_test_slot_throw_ios.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleDisplayName</key>
 	<string>CppDevTk Test Slot Throw</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleGetInfoString</key>
 	<string>CppDevTk test application.</string>
 	<key>CFBundleIdentifier</key>
diff --git a/test/test_slot_throw/cppdevtk_test_slot_throw_ios_debug.plist b/test/test_slot_throw/cppdevtk_test_slot_throw_ios_debug.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleDisplayName</key>
 	<string>CppDevTk Test Slot Throw Debug</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleGetInfoString</key>
 	<string>CppDevTk test application.</string>
 	<key>CFBundleIdentifier</key>
diff --git a/test/test_slot_throw/cppdevtk_test_slot_throw_mac.plist b/test/test_slot_throw/cppdevtk_test_slot_throw_mac.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleDisplayName</key>
 	<string>CppDevTk Test Slot Throw</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleGetInfoString</key>
 	<string>CppDevTk test application.</string>
 	<key>CFBundleIdentifier</key>
diff --git a/test/test_slot_throw/cppdevtk_test_slot_throw_mac_debug.plist b/test/test_slot_throw/cppdevtk_test_slot_throw_mac_debug.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleDisplayName</key>
 	<string>CppDevTk Test Slot Throw Debug</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.7</string>
+	<string>1.0.6</string>
 	<key>CFBundleGetInfoString</key>
 	<string>CppDevTk test application.</string>
 	<key>CFBundleIdentifier</key>
diff --git a/test/test_util/android/AndroidManifest.xml b/test/test_util/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest package="org.qtproject.example.cppdevtk_test_util" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0.7" android:versionCode="107" android:installLocation="auto">
+<manifest package="org.qtproject.example.cppdevtk_test_util" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0.6" android:versionCode="106" android:installLocation="auto">
     <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="cppdevtk_test_util">
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation"
                   android:name="org.qtproject.qt5.android.bindings.QtActivity"

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ else {`
`58`	`58`	`# version`
`59`	`59`	`CPPDEVTK_VERSION_MAJOR = 1`
`60`	`60`	`CPPDEVTK_VERSION_MINOR = 0`
`61`		`-CPPDEVTK_VERSION_PATCH = 7`
	`61`	`+CPPDEVTK_VERSION_PATCH = 6`
`62`	`62`	`win32 {`
`63`	`63`	`CPPDEVTK_VERSION_BUILD = 1`
`64`	`64`	`}`
`@@ -612,16 +612,16 @@ else {`
`612`	`612`	`error("Qt must set _MSC_VER in QMAKE_COMPILER_DEFINES")`
`613`	`613`	`}`
`614`	`614`	`if(isEqual(CPPDEVTK_MSC_VER, "1700")\|greaterThan(CPPDEVTK_MSC_VER, 1700)):contains(DEFINES, _USING_V110_SDK71_) {`
`615`		`- INCLUDEPATH = "C:/Program Files (x86)/Microsoft SDKs/Windows/7.1A/Include" $${INCLUDEPATH}`
	`615`	`+ INCLUDEPATH = "C:/Program Files (x86)/Microsoft SDKs/Windows/v7.1A/Include" $${INCLUDEPATH}`
`616`	`616`	`isEqual(QMAKE_TARGET.arch, "x86_64") {`
`617`	`617`	`QMAKE_LFLAGS_WINDOWS *= /SUBSYSTEM:WINDOWS,5.02`
`618`	`618`	`QMAKE_LFLAGS_CONSOLE *= /SUBSYSTEM:CONSOLE,5.02`
`619`		`- LIBS = -L"C:/Program Files (x86)/Microsoft SDKs/Windows/7.1A/Lib/x64" $${LIBS}`
	`619`	`+ LIBS = -L"C:/Program Files (x86)/Microsoft SDKs/Windows/v7.1A/Lib/x64" $${LIBS}`
`620`	`620`	`}`
`621`	`621`	`else {`
`622`	`622`	`QMAKE_LFLAGS_WINDOWS *= /SUBSYSTEM:WINDOWS,5.01`
`623`	`623`	`QMAKE_LFLAGS_CONSOLE *= /SUBSYSTEM:CONSOLE,5.01`
`624`		`- LIBS = -L"C:/Program Files (x86)/Microsoft SDKs/Windows/7.1A/Lib" $${LIBS}`
	`624`	`+ LIBS = -L"C:/Program Files (x86)/Microsoft SDKs/Windows/v7.1A/Lib" $${LIBS}`
`625`	`625`	`}`
`626`	`626`	`}`
`627`	`627`	`}`