AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mac: Fix link error in printdialog.

Browse Source 
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>
This commit is contained in:
Morten Sorvig 2011-08-19 14:27:58 +02:00 committed by Richard Moe Gustavsen
parent c7bbf22132
commit 57bc4f255a
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/printsupport/dialogs/qprintdialog_unix.cpp
View 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