From 57bc4f255a737bfdcd40f2aba62fdf7ce9f2e967 Mon Sep 17 00:00:00 2001 From: Morten Sorvig Date: Fri, 19 Aug 2011 14:27:58 +0200 Subject: Mac: Fix link error in printdialog. Recompiling QtWidgets on Mac fails with: "ld: duplicate symbol qInitResources_qprintdialog() in .obj/debug-shared/qrc_qprintdialog.o and .obj/debug-shared/qprintdialog_unix.o " Ifdef out the include from qprintdialog_unix, leaving us with one instance of the synbol. Change-Id: I7e1f45de65020253e0cad4155fca94944e66c177 Reviewed-on: http://codereview.qt.nokia.com/3270 Reviewed-by: Qt Sanity Bot Reviewed-by: Richard Moe Gustavsen --- src/printsupport/dialogs/qprintdialog_unix.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/printsupport') diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp index 8da3665d56..57baf76704 100644 --- a/src/printsupport/dialogs/qprintdialog_unix.cpp +++ b/src/printsupport/dialogs/qprintdialog_unix.cpp @@ -1280,7 +1280,9 @@ QT_END_NAMESPACE #include "moc_qprintdialog.cpp" #include "qprintdialog_unix.moc" +#ifndef Q_OS_MAC #include "qrc_qprintdialog.cpp" +#endif #endif // QT_NO_PRINTDIALOG -- cgit v1.2.3