Mac: Fix link error in printdialog.
authorMorten Sorvig <morten.sorvig@nokia.com>
Fri, 19 Aug 2011 12:27:58 +0000 (14:27 +0200)
committerRichard Moe Gustavsen <richard.gustavsen@nokia.com>
Tue, 23 Aug 2011 07:14:28 +0000 (09:14 +0200)
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 <qt_sanity_bot@ovi.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
src/printsupport/dialogs/qprintdialog_unix.cpp

index 8da3665..57baf76 100644 (file)
@@ -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