r15244 by cbradney - #8984: Bring forward this patch.. it was in 137
scribus-commit
scribus-commit at lists.scribus.net
Sun Jun 20 23:30:24 CEST 2010
Revision: 15244
Author: cbradney
Date: 2010-06-20T21:27:41.050573Z
Commit message: #8984: Bring forward this patch.. it was in 137
Changeset:
M /trunk/Scribus/scribus/CMakeLists.txt
M /trunk/Scribus/scribus/ui/aligndistribute.cpp
Diffs:
Index: scribus/ui/aligndistribute.cpp
===================================================================
--- scribus/ui/aligndistribute.cpp (revision 15243)
+++ scribus/ui/aligndistribute.cpp (revision 15244)
@@ -178,7 +178,6 @@
{
undoManager = UndoManager::instance();
-// GUI3-4 compile PV
alignLeftOutToolButton->setIcon(QIcon(loadIcon("22/align-horizontal-left-out.png")));
alignLeftInToolButton->setIcon(QIcon(loadIcon("22/align-horizontal-left.png")));
alignCenterHorToolButton->setIcon(QIcon(loadIcon("22/align-horizontal-center.png")));
Index: scribus/CMakeLists.txt
===================================================================
--- scribus/CMakeLists.txt (revision 15243)
+++ scribus/CMakeLists.txt (revision 15244)
@@ -997,6 +997,11 @@
${GMAGICK_LIBRARIES}
)
+# required to resolve symbols from libdl when ld is called with --no-add-needed
+IF(UNIX)
+ TARGET_LINK_LIBRARIES(${EXE_NAME} dl)
+ENDIF(UNIX)
+
IF(WIN32)
TARGET_LINK_LIBRARIES(${EXE_NAME} ${QT_QTMAIN_LIBRARY})
ENDIF(WIN32)
More information about the scribus-commit
mailing list