equal
deleted
inserted
replaced
31 contains(QT_CONFIG, webkit) { |
31 contains(QT_CONFIG, webkit) { |
32 QT += webkit |
32 QT += webkit |
33 DEFINES += HBUTILS_WEBKIT |
33 DEFINES += HBUTILS_WEBKIT |
34 } |
34 } |
35 |
35 |
36 DEFINES += BUILD_HB_TOOLS HB_PLUGINS_DIR=\"\\\"$${HB_PLUGINS_DIR}\\\"\" |
36 DEFINES += BUILD_HB_UTILS HB_PLUGINS_DIR=\"\\\"$${HB_PLUGINS_DIR}\\\"\" |
37 |
37 |
38 INCLUDEPATH += . |
38 INCLUDEPATH += . |
39 DEPENDPATH += . |
39 DEPENDPATH += . |
40 |
40 |
41 # directories |
41 # directories |
42 DESTDIR = $${HB_BUILD_DIR}/lib |
42 DESTDIR = $${HB_BUILD_DIR}/lib |
43 win32:DLLDESTDIR = $${HB_BUILD_DIR}/bin |
43 win32:DLLDESTDIR = $${HB_BUILD_DIR}/bin |
44 |
44 |
45 # components |
45 # components |
46 include(document/document.pri) |
46 include(document/document.pri) |
|
47 include(theme/theme.pri) |
47 |
48 |
48 CONVENIENCE_HEADERS += $${HB_BUILD_DIR}/include/hbutils/hbutils.h |
49 CONVENIENCE_HEADERS += $${HB_BUILD_DIR}/include/hbutils/hbutils.h |
49 CONVENIENCE_HEADERS += $$files($${HB_BUILD_DIR}/include/hbutils/Hb*) |
50 CONVENIENCE_HEADERS += $$files($${HB_BUILD_DIR}/include/hbutils/Hb*) |
50 HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS $$CONVENIENCE_HEADERS |
51 HEADERS += $$PUBLIC_HEADERS $$RESTRICTED_HEADERS $$PRIVATE_HEADERS $$CONVENIENCE_HEADERS |
51 |
52 |
52 # dependencies |
53 # dependencies |
53 hbAddLibrary(hbcore/HbCore) |
54 hbAddLibrary(hbcore/HbCore) |
54 hbAddLibrary(hbwidgets/HbWidgets) |
55 hbAddLibrary(hbwidgets/HbWidgets) |
55 |
56 |
59 win32:dlltarget.path = $${HB_BIN_DIR} |
60 win32:dlltarget.path = $${HB_BIN_DIR} |
60 |
61 |
61 pubheaders.files = $$PUBLIC_HEADERS |
62 pubheaders.files = $$PUBLIC_HEADERS |
62 pubheaders.path = $${HB_INCLUDE_DIR}/hbutils |
63 pubheaders.path = $${HB_INCLUDE_DIR}/hbutils |
63 |
64 |
|
65 restheaders.files = $$RESTRICTED_HEADERS |
|
66 restheaders.path = $${HB_INCLUDE_DIR}/hbutils/restricted |
|
67 |
64 convheaders.files = $$CONVENIENCE_HEADERS |
68 convheaders.files = $$CONVENIENCE_HEADERS |
65 convheaders.path = $${HB_INCLUDE_DIR}/hbutils |
69 convheaders.path = $${HB_INCLUDE_DIR}/hbutils |
66 |
70 |
67 INSTALLS += target pubheaders convheaders |
71 INSTALLS += target pubheaders restheaders convheaders |
68 win32:INSTALLS += dlltarget |
72 win32:INSTALLS += dlltarget |
69 } |
73 } |
70 |
74 |
71 #QMAKE_DISTCLEAN += $$hbNativePath($${HB_BUILD_DIR}/include/hbutils/*) |
75 #QMAKE_DISTCLEAN += $$hbNativePath($${HB_BUILD_DIR}/include/hbutils/*) |
72 #QMAKE_DISTCLEAN += $$hbNativePath($${HB_BUILD_DIR}/include/hbutils/private/*) |
76 #QMAKE_DISTCLEAN += $$hbNativePath($${HB_BUILD_DIR}/include/hbutils/private/*) |