diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-09-21 08:26:20 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-21 10:06:19 +0200 |
| commit | 28d2e38c3e62aef3e5a9c6906aedb9aedda9b70f (patch) | |
| tree | 2cbb0e9e054988c13b4b76ec2281a6cd8de03431 /src/assistant/help/help.pro | |
| parent | cec7bcc45d91401b840c778332516792e9d2c9e3 (diff) | |
| download | qttools-28d2e38c3e62aef3e5a9c6906aedb9aedda9b70f.tar.gz | |
Fixed compile of QtHelp on mac when frameworks are in use
Removed the incorrect assumption that QtCLucene is never a
framework.
Note that this logic still doesn't match exactly what is in qtAddLibrary
or qtAddModule in qt_functions.prf, therefore the build may still
fail in some exotic setups.
Change-Id: If032c0c4ac6031b5bb28033996a8773ecdb077e9
Reviewed-on: http://codereview.qt-project.org/5264
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Diffstat (limited to 'src/assistant/help/help.pro')
| -rw-r--r-- | src/assistant/help/help.pro | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro index 4bff94440..76b4b9434 100644 --- a/src/assistant/help/help.pro +++ b/src/assistant/help/help.pro @@ -17,15 +17,22 @@ HEADERS += qthelpversion.h DEFINES -= QT_ASCII_CAST_WARNINGS -qclucene = QtCLucene$${QT_LIBINFIX} -if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { - mac:qclucene = $${qclucene}_debug - win32:qclucene = $${qclucene}d +mac:CONFIG(qt_framework, qt_framework|qt_no_framework) { + qclucene = -framework QtCLucene$${QT_LIBINFIX} +} +else { + qclucene = QtCLucene$${QT_LIBINFIX} + if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { + mac:qclucene = $${qclucene}_debug + win32:qclucene = $${qclucene}d + } + linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene + unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtCore QtNetwork QtSql + qclucene = -l$$qclucene + LIBS_PRIVATE += -L$$QT.clucene.libs } -linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene -unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtCore QtNetwork QtSql -LIBS_PRIVATE += -L$$QT.clucene.libs -l$$qclucene +LIBS_PRIVATE += $$qclucene RESOURCES += helpsystem.qrc SOURCES += qhelpenginecore.cpp \ qhelpengine.cpp \ |