qmake: define BUILD_XXX_LIB for static build

it should be always defined. otherwise there are warnings about deprecated apis
zhengsjgoembed · Oct 22, 2015 · c25e452 · c25e452
1 parent b883fd4
commit c25e452
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/examples/common/libcommon.pri b/examples/common/libcommon.pri
@@ -97,7 +97,6 @@ DEPENDPATH *= $$PROJECT_SRCPATH
     #}
 } else {
 	#Add your additional configuration first. e.g.
-
 #	win32: LIBS += -lUser32
 # The following may not need to change
     !CONFIG(plugin) {
@@ -107,11 +106,11 @@ DEPENDPATH *= $$PROJECT_SRCPATH
     }
         TARGET = $$PROJECT_TARGETNAME ##I commented out this before, why?
         CONFIG *= create_prl #
-	isEqual(STATICLINK, 1) {
+        DEFINES += BUILD_$$upper($$NAME)_LIB #win32-msvc*
+        isEqual(STATICLINK, 1) {
 		CONFIG -= shared dll ##otherwise the following shared is true, why?
 		CONFIG *= staticlib
 	} else {
-                DEFINES += BUILD_$$upper($$NAME)_LIB #win32-msvc*
 		CONFIG *= shared #shared includes dll
 	}
 

diff --git a/qml/libQmlAV.pri b/qml/libQmlAV.pri
@@ -92,7 +92,6 @@ DEPENDPATH *= $$PROJECT_SRCPATH
 	}
 } else {
 	#Add your additional configuration first. e.g.
-
 #	win32: LIBS += -lUser32
 # The following may not need to change
     !CONFIG(plugin) {
@@ -102,11 +101,11 @@ DEPENDPATH *= $$PROJECT_SRCPATH
     }
         TARGET = $$PROJECT_TARGETNAME ##I commented out this before, why?
         CONFIG *= create_prl #
-	isEqual(STATICLINK, 1) {
+        DEFINES += BUILD_$$upper($$NAME)_LIB #win32-msvc*
+        isEqual(STATICLINK, 1) {
 		CONFIG -= shared dll ##otherwise the following shared is true, why?
 		CONFIG *= staticlib
 	} else {
-                DEFINES += BUILD_$$upper($$NAME)_LIB #win32-msvc*
 		CONFIG *= shared #shared includes dll
 	}
 

diff --git a/src/libQtAV.pri b/src/libQtAV.pri
@@ -98,7 +98,6 @@ DEPENDPATH *= $$PROJECT_SRCPATH
     }
 } else {
 	#Add your additional configuration first. e.g.
-
 #	win32: LIBS += -lUser32
 # The following may not need to change
     !CONFIG(plugin) {
@@ -108,11 +107,11 @@ DEPENDPATH *= $$PROJECT_SRCPATH
     }
         TARGET = $$PROJECT_TARGETNAME ##I commented out this before, why?
         CONFIG *= create_prl #
-	isEqual(STATICLINK, 1) {
+        DEFINES += BUILD_$$upper($$NAME)_LIB #win32-msvc*
+        isEqual(STATICLINK, 1) {
 		CONFIG -= shared dll ##otherwise the following shared is true, why?
 		CONFIG *= staticlib
 	} else {
-                DEFINES += BUILD_$$upper($$NAME)_LIB #win32-msvc*
 		CONFIG *= shared #shared includes dll
 	}
 

diff --git a/widgets/libQtAVWidgets.pri b/widgets/libQtAVWidgets.pri
@@ -96,7 +96,6 @@ DEPENDPATH *= $$PROJECT_SRCPATH
     }
 } else {
 	#Add your additional configuration first. e.g.
-
 #	win32: LIBS += -lUser32
 # The following may not need to change
     !CONFIG(plugin) {
@@ -106,11 +105,11 @@ DEPENDPATH *= $$PROJECT_SRCPATH
     }
         TARGET = $$PROJECT_TARGETNAME ##I commented out this before, why?
         CONFIG *= create_prl #
-	isEqual(STATICLINK, 1) {
+        DEFINES += BUILD_$$upper($$NAME)_LIB #win32-msvc*
+        isEqual(STATICLINK, 1) {
 		CONFIG -= shared dll ##otherwise the following shared is true, why?
 		CONFIG *= staticlib
 	} else {
-                DEFINES += BUILD_$$upper($$NAME)_LIB #win32-msvc*
 		CONFIG *= shared #shared includes dll
 	}