HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/PythonQt Commit - r8:7250c4578e1b

.hgignore +1 0

             syntax: glob
             *.o
             moc_*
+            *.pro.user

PythonQt.pro +5 -5

@@ -3,8 +3,8 TEMPLATE = subdirs
3	CONFIG += ordered	3	CONFIG += ordered
4	SUBDIRS = src extensions #tests examples	4	SUBDIRS = src extensions #tests examples
5		5
6	#contains(QT_MAJOR_VERSION, 5) {	6	contains(QT_MAJOR_VERSION, 5) {
7	#SUBDIRS += generator_50	7	SUBDIRS += generator_50
8	#} else {	8	} else {
9	#SUBDIRS += generator	9	SUBDIRS += generator
10	#}	10	}

build/pythonqt.prf +53 -32

@@ -1,13 +1,27
1	# profile for non-mevis users to link to PythonQt	1	# profile for non-mevis users to link to PythonQt
2		2
3	# profile to include and link Python	3	# check if debug or release
		4	CONFIG(debug, debug\|release) {
		5	DEBUG_EXT = _d
		6	} else {
		7	DEBUG_EXT =
		8	}
		9
		10	#=========================================================================#
		11	# ____ _ _ __ _ #
		12	# \| _ \ _ _\| \|_\| \|__ ___ _ __ ___ ___ _ __ / _(_) __ _ #
		13	# \| \|_) \| \| \| \| __\| '_ \ / _ \\| '_ \ / __/ _ \\| '_ \\| \|_\| \|/ _` \| #
		14	# \| __/\| \|_\| \| \|_\| \| \| \| (_) \| \| \| \| \| (_\| (_) \| \| \| \| _\| \| (_\| \| #
		15	# \|_\| \__, \|\__\|_\| \|_\|\___/\|_\| \|_\| \___\___/\|_\| \|_\|_\| \|_\|\__, \| #
		16	# \|___/ \|___/ #
		17	#=========================================================================#
		18	#
4		19
5	# Change this variable to your python version (2.5, 2.6)	20	# Change this variable to your python version (2.5, 2.6)
6	win32:PYTHON_VERSION=27	21	win32:PYTHON_VERSION=27
7	unix:PYTHON_VERSION=2.7	22	unix:PYTHON_VERSION=2.7
8	PYTHON_PATH=C:/Python27/	23	PYTHON_PATH=C:/Python27/
9	PYTHON_LIB=C:/Python27/libs/	24	PYTHON_LIB=C:/Python27/libs/
10	INCLUDEPATH += $$[QT_INSTALL_HEADERS]/PythonQt
11	macx {	25	macx {
12	# for macx you need to have the Python development kit installed as framework	26	# for macx you need to have the Python development kit installed as framework
13	INCLUDEPATH += /System/Library/Frameworks/Python.framework/Headers	27	INCLUDEPATH += /System/Library/Frameworks/Python.framework/Headers
@@ -27,12 +41,6 macx {
27	# set PYTHON_PATH = c:\yourDir\Python-2.6.1\	41	# set PYTHON_PATH = c:\yourDir\Python-2.6.1\
28	# set PYTHON_LIB = c:\yourDir\Python-2.6.1\PCbuild8\Win32	42	# set PYTHON_LIB = c:\yourDir\Python-2.6.1\PCbuild8\Win32
29		43
30	# check if debug or release
31	CONFIG(debug, debug\|release) {
32	DEBUG_EXT = _d
33	} else {
34	DEBUG_EXT =
35	}
36		44
37	win32:INCLUDEPATH += $$PYTHON_PATH/PC $$PYTHON_PATH/include	45	win32:INCLUDEPATH += $$PYTHON_PATH/PC $$PYTHON_PATH/include
38	win32-msvc*:LIBS += $$PYTHON_LIB/python$${PYTHON_VERSION}$${DEBUG_EXT}.lib	46	win32-msvc*:LIBS += $$PYTHON_LIB/python$${PYTHON_VERSION}$${DEBUG_EXT}.lib
@@ -41,37 +49,50 macx {
41	} else:unix {	49	} else:unix {
42	# on linux, python-config is used to autodetect Python.	50	# on linux, python-config is used to autodetect Python.
43	# make sure that you have installed a matching python-dev package.	51	# make sure that you have installed a matching python-dev package.
44		52
45	unix:LIBS += $$system(python$${PYTHON_VERSION}-config --libs)	53	unix:LIBS += $$system(python$${PYTHON_VERSION}-config --libs)
46	unix:QMAKE_CXXFLAGS += $$system(python$${PYTHON_VERSION}-config --includes)	54	unix:QMAKE_CXXFLAGS += $$system(python$${PYTHON_VERSION}-config --includes)
47	}	55	}
48		56
49	INCLUDEPATH += $$[QT_INSTALL_HEADERS]/PythonQt	57	#===========================================================#
50		58	# ______ _______ _ _ ___ _ _ ___ _____ #
51	# check if debug or release	59	# \| _ \ \ / /_ _\| \| \| \|/ _ \\| \ \| \| / _ \_ _\| #
52	CONFIG(debug, debug\|release) {	60	# \| \|_) \ V / \| \| \| \|_\| \| \| \| \| \\| \| \| \| \| \|\| \| #
53	DEBUG_EXT = _d	61	# \| __/ \| \| \| \| \| _ \| \|_\| \| \|\ \| \| \|_\| \|\| \| #
54	} else {	62	# \|_\| \|_\| \|_\| \|_\| \|_\|\___/\|_\| \_\| \__\_\\|_\| #
55	DEBUG_EXT =	63	# #
		64	#===========================================================#
		65
		66	contains(CONFIG,BUILDING_PYTHONQT){
		67	message("BUILDING PYTHONQT")
		68	}
		69	!contains(CONFIG,BUILDING_PYTHONQT){
		70	INCLUDEPATH += $$[QT_INSTALL_HEADERS]/PythonQt
		71	win32::LIBS += -lPythonQt$${DEBUG_EXT}
		72	unix::LIBS += -lPythonQt$${DEBUG_EXT}
56	}	73	}
57		74
58	#win32-msvc*:LIBS += $$PWD/../lib/PythonQt$${DEBUG_EXT}.lib	75	#===============================================================================#
59	#win32-g++:LIBS += $$PWD/../lib/libPythonQt$${DEBUG_EXT}.a	76	# ______ _______ _ _ ___ _ _ ___ _____ _ _ _ #
60	#unix:LIBS += -L$$OUT_PWD/../lib -L$$OUT_PWD/../../lib -lPythonQt$${DEBUG_EXT}	77	# \| _ \ \ / /_ _\| \| \| \|/ _ \\| \ \| \| / _ \_ _\| / \ \| \| \| \| #
61		78	# \| \|_) \ V / \| \| \| \|_\| \| \| \| \| \\| \| \| \| \| \|\| \| / _ \ \| \| \| \| #
62	########################################################################################	79	# \| __/ \| \| \| \| \| _ \| \|_\| \| \|\ \| \| \|_\| \|\| \| / ___ \\| \|___\| \|___ #
63	#################### PYTHON_QT_ALL ###################################################	80	# \|_\| \|_\| \|_\| \|_\| \|_\|\___/\|_\| \_\| \__\_\\|_\| /_/ \_\_____\|_____\| #
64	########################################################################################	81	# #
		82	#===============================================================================#
		83
65	contains(CONFIG,BUILDING_QTALL){	84	contains(CONFIG,BUILDING_QTALL){
66	message("BUILDING_QTALL")	85	message("BUILDING_QTALL")
67	LIBS += -L$$DESTDIR ~~-lPythonQt$${DEBUG_EXT~~}	86	win32::LIBS += -L$${DESTDIR}
68	} else {	87	unix::LIBS += -L$${DESTDIR}
69	win32::LIBS += -lPythonQt_QtAll$${DEBUG_EXT}	88	}
70	unix::LIBS += -lPythonQt_QtAll$${DEBUG_EXT}	89	!contains(CONFIG,BUILDING_QTALL){
71	########################################################################################	90	!contains(CONFIG,BUILDING_PYTHONQT){
72	#################### PYTHON_QT ######################################################	91	win32::LIBS += -lPythonQt_QtAll$${DEBUG_EXT}
73	########################################################################################	92	unix::LIBS += -lPythonQt_QtAll$${DEBUG_EXT}
74	win32::LIBS += -lPythonQt$${DEBUG_EXT}	93	}
75	unix::LIBS += -lPythonQt$${DEBUG_EXT}	94
76	}	95	}
77		96
		97
		98

extensions/PythonQt_QtAll/PythonQt_QtAll.pro 0 -1

             DESTDIR    = ../../lib
-            include ( ../../build/common.prf )
             CONFIG+=BUILDING_QTALL
             include ( ../../build/pythonqt.prf )

src/src.pro +3 -6

               OTHER_FILES += ../scripts/osx-fix-dylib.sh
             }
-            include ( ../build/common.prf )
+            CONFIG += BUILDING_PYTHONQT
-            include ( ../build/python.prf )
+            include ( ../build/pythonqt.prf )
             include ( src.pri )
-            #added by Aje for install QT dirs.
+            #Install PythonQt as Qt feature
-            #Copyed from Qscintilla config ;).
             pythoncfg.path = $$[QT_INSTALL_PREFIX]/mkspecs/features
             pythoncfg.files = ../build/pythonqt.prf

CMakeLists.txt removed 0 -186

NO CONTENT: file was removed

build/PythonQt_QtAll.prf removed 0 -13

NO CONTENT: file was removed

build/common.prf removed 0 -23

NO CONTENT: file was removed

build/python.prf removed 0 -43

NO CONTENT: file was removed

cmake/FindPython.cmake removed 0 -189

NO CONTENT: file was removed

cmake/PythonQt_Qt_4x.cmake removed 0 -53

NO CONTENT: file was removed

cmake/PythonQt_Qt_5x.cmake removed 0 -19

NO CONTENT: file was removed

cmake/cmake_uninstall.cmake.in removed 0 -24

NO CONTENT: file was removed

examples/CMakeLists.txt removed 0 -2

NO CONTENT: file was removed

examples/NicePyConsole/CMakeLists.txt removed 0 -59

NO CONTENT: file was removed

extensions/CMakeLists.txt removed 0 -2

NO CONTENT: file was removed

extensions/PythonQt_QtAll/CMakeLists.txt removed 0 -193

NO CONTENT: file was removed

extensions/PythonQt_QtAll/PythonQt_QtAllConfig.cmake.in removed 0 -30

NO CONTENT: file was removed

extensions/PythonQt_QtAll/PythonQt_QtAllConfigVersion.cmake.in removed 0 -11

NO CONTENT: file was removed

generator/CMakeLists.txt removed 0 -162

NO CONTENT: file was removed

generator_50/CMakeLists.txt removed 0 -40

NO CONTENT: file was removed

generator_50/generator_50.cmake removed 0 -47

NO CONTENT: file was removed

generator_50/parser/rpp/rpp.cmake removed 0 -22

NO CONTENT: file was removed

generator_50/parser/rxx.cmake removed 0 -55

NO CONTENT: file was removed

src/CMakeLists.txt removed 0 -137

NO CONTENT: file was removed

src/PythonQtConfig.cmake.in removed 0 -22

NO CONTENT: file was removed

src/PythonQtConfigVersion.cmake.in removed 0 -11

NO CONTENT: file was removed

tests/CMakeLists.txt removed 0 -26

NO CONTENT: file was removed

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages