diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-17 08:43:48 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-17 10:48:25 (GMT) |
| commit | 83940f25dba51a9942ab55ed8475fc7fc8a8da84 (patch) | |
| tree | f75781414ee2686d9e02edafb8b713bc4aa6e613 /tools/assistant | |
| parent | 5bc8c27e9406fd55693e3a3963030c6d9a89b08a (diff) | |
| download | Qt-83940f25dba51a9942ab55ed8475fc7fc8a8da84.zip Qt-83940f25dba51a9942ab55ed8475fc7fc8a8da84.tar.gz Qt-83940f25dba51a9942ab55ed8475fc7fc8a8da84.tar.bz2 | |
Use LIBS_PRIVATE on Mac and X11.
On the Mac, it means "-framework ApplicationServices -framework Carbon
-framework AppKit" are no longer part of the default LIBS in Qt
applications. This required a lot of fixes where we used Mac-specific
code in Qt.
On X11, it was very straightforward, because we apparently use very
little of X11 outside QtGui.
I haven't changed the Windows-specific LIBS paths, because I don't
know how Windows behaves. Windows has DLLs, but it links to static
"import" libraries. So is it static linking or dynamic linking?
Reviewed-By: Marius Storm-Olsen
Diffstat (limited to 'tools/assistant')
| -rw-r--r-- | tools/assistant/lib/lib.pro | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tools/assistant/lib/lib.pro b/tools/assistant/lib/lib.pro index 5d6d436..011dec2 100644 --- a/tools/assistant/lib/lib.pro +++ b/tools/assistant/lib/lib.pro @@ -18,14 +18,12 @@ if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { mac:qclucene = $${qclucene}_debug win32:qclucene = $${qclucene}d } -linux-lsb-g++:LIBS += --lsb-shared-libs=$$qclucene -unix:QMAKE_PKGCONFIG_REQUIRES += QtNetwork \ - QtSql \ - QtXml -LIBS += -l$$qclucene +linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene unix:QMAKE_PKGCONFIG_REQUIRES += QtNetwork \ QtSql \ QtXml +LIBS_PRIVATE += -l$$qclucene + RESOURCES += helpsystem.qrc SOURCES += qhelpenginecore.cpp \ qhelpengine.cpp \ |