added naming patch to make versioning clearer

florianlink · florianlink · commit 7364b63b584b · 2017-06-06T07:26:06.000Z
diff --git a/build/PythonQt.prf b/build/PythonQt.prf
@@ -11,5 +11,5 @@ CONFIG(debug, debug|release) {
   DEBUG_EXT = 
 }
 
-win32::LIBS += $$PWD/../lib/PythonQt$${DEBUG_EXT}.lib
-unix::LIBS += -L$$PWD/../lib -lPythonQt$${DEBUG_EXT}
+win32::LIBS += $$PWD/../liPythonQt-Qt5-Python$${PYTHON_VERSION}$${DEBUG_EXT}.lib
+unix::LIBS += -L$$PWD/../lib -lPythonQt-Qt5-Python$${PYTHON_VERSION}$${DEBUG_EXT}
diff --git a/build/PythonQt_QtAll.prf b/build/PythonQt_QtAll.prf
@@ -9,5 +9,5 @@ CONFIG(debug, debug|release) {
   DEBUG_EXT = 
 }
 
-win32::LIBS += $$PWD/../lib/PythonQt_QtAll$${DEBUG_EXT}.lib
-unix::LIBS += -L$$PWD/../lib -lPythonQt_QtAll$${DEBUG_EXT}
+win32::LIBS += $$PWD/../liPythonQt_QtAll-Qt5-Python$${PYTHON_VERSION}$${DEBUG_EXT}.lib
+unix::LIBS += -L$$PWD/../lib -lPythonQt_QtAll-Qt5-Python$${PYTHON_VERSION}$${DEBUG_EXT}
diff --git a/build/common.prf b/build/common.prf
@@ -50,3 +50,4 @@ PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp
   }
 }
 
+VERSION = 3.2.0
diff --git a/extensions/PythonQt_QtAll/PythonQt_QtAll.pro b/extensions/PythonQt_QtAll/PythonQt_QtAll.pro
@@ -1,13 +1,14 @@
 # If Qt has support for webkit, add it:
 qtHaveModule(webkit):CONFIG += PythonQtWebKit
 
-TARGET   = PythonQt_QtAll
+TARGET   = PythonQt_QtAll-Qt5-PythonXY
 TEMPLATE = lib
 
 DESTDIR    = ../../lib
 
 include ( ../../build/common.prf )  
 include ( ../../build/PythonQt.prf )  
+TARGET = $$replace(TARGET, PythonXY, Python$${PYTHON_VERSION})
 
 CONFIG += dll qt
 
diff --git a/src/src.pro b/src/src.pro
@@ -4,7 +4,7 @@
 # $Source$
 # --------------------------------------------------
 
-TARGET   = PythonQt
+TARGET   = PythonQt-Qt5-PythonXY
 TEMPLATE = lib
 
 
@@ -35,6 +35,7 @@ INCLUDEPATH += $$PWD
 
 include ( ../build/common.prf )  
 include ( ../build/python.prf )
+TARGET = $$replace(TARGET, PythonXY, Python$${PYTHON_VERSION})
 
 include ( src.pri )  
 

Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@ CONFIG(debug, debug\|release) {`
`11`	`11`	`DEBUG_EXT =`
`12`	`12`	`}`
`13`	`13`
`14`		`-win32::LIBS += $$PWD/../lib/PythonQt$${DEBUG_EXT}.lib`
`15`		`-unix::LIBS += -L$$PWD/../lib -lPythonQt$${DEBUG_EXT}`
	`14`	`+win32::LIBS += $$PWD/../liPythonQt-Qt5-Python$${PYTHON_VERSION}$${DEBUG_EXT}.lib`
	`15`	`+unix::LIBS += -L$$PWD/../lib -lPythonQt-Qt5-Python$${PYTHON_VERSION}$${DEBUG_EXT}`
Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,5 @@ CONFIG(debug, debug\|release) {`
`9`	`9`	`DEBUG_EXT =`
`10`	`10`	`}`
`11`	`11`
`12`		`-win32::LIBS += $$PWD/../lib/PythonQt_QtAll$${DEBUG_EXT}.lib`
`13`		`-unix::LIBS += -L$$PWD/../lib -lPythonQt_QtAll$${DEBUG_EXT}`
	`12`	`+win32::LIBS += $$PWD/../liPythonQt_QtAll-Qt5-Python$${PYTHON_VERSION}$${DEBUG_EXT}.lib`
	`13`	`+unix::LIBS += -L$$PWD/../lib -lPythonQt_QtAll-Qt5-Python$${PYTHON_VERSION}$${DEBUG_EXT}`
Original file line number	Diff line number	Diff line change
`@@ -50,3 +50,4 @@ PYTHONQT_GENERATED_PATH = $$PWD/../generated_cpp`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
	`53`	`+VERSION = 3.2.0`