| @@ -45,6 +45,8 mac: { | |||||
| 45 | # it should probably define the minimum OSX version to be 10.5... |
|
45 | # it should probably define the minimum OSX version to be 10.5... | |
| 46 | QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5 |
|
46 | QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5 | |
| 47 | QMAKE_LFLAGS *= -mmacosx-version-min=10.5 |
|
47 | QMAKE_LFLAGS *= -mmacosx-version-min=10.5 | |
|
|
48 | ||||
|
|
49 | CHART_BUILD_LIB_DIR = $$CHART_BUILD_BIN_DIR | |||
| 48 | } |
|
50 | } | |
| 49 |
|
51 | |||
| 50 | ##################### DEVELOPMENT BUILD ################################################### |
|
52 | ##################### DEVELOPMENT BUILD ################################################### | |
| @@ -78,8 +80,7 development_build: { | |||||
| 78 | win32: LIBRARY_NAME = $$join(LIBRARY_NAME,,,d) |
|
80 | win32: LIBRARY_NAME = $$join(LIBRARY_NAME,,,d) | |
| 79 | } |
|
81 | } | |
| 80 |
|
82 | |||
| 81 | LIBS += -l$$LIBRARY_NAME |
|
83 | LIBS += -l$$LIBRARY_NAME | |
| 82 |
|
||||
| 83 |
|
84 | |||
| 84 | mac: { |
|
85 | mac: { | |
| 85 | # This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX |
|
86 | # This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX | |
| @@ -109,7 +110,5 development_build: { | |||||
| 109 | } |
|
110 | } | |
| 110 |
|
111 | |||
| 111 | } else { |
|
112 | } else { | |
| 112 |
|
113 | CONFIG += qtcommercialchart | ||
| 113 | CONFIG += qtcommercialchart |
|
114 | } | |
| 114 |
|
||||
| 115 | } No newline at end of file |
|
|||
| @@ -48,5 +48,4 INSTALLS += target qmldir | |||||
| 48 |
|
48 | |||
| 49 | FILE = $$PWD/qmldir |
|
49 | FILE = $$PWD/qmldir | |
| 50 | win32:{FILE = $$replace(FILE, "/","\\")} |
|
50 | win32:{FILE = $$replace(FILE, "/","\\")} | |
| 51 | mac: QMAKE_POST_LINK += " & " |
|
|||
| 52 | QMAKE_POST_LINK += $$QMAKE_COPY $$FILE $$CHART_BUILD_PLUGIN_DIR |
|
51 | QMAKE_POST_LINK += $$QMAKE_COPY $$FILE $$CHART_BUILD_PLUGIN_DIR | |
General Comments 0
You need to be logged in to leave comments.
Login now