diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-06-17 11:54:16 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-06-17 11:54:16 (GMT) |
| commit | 2b39081bf101e53a70ff056d527dc3dfb8208bf0 (patch) | |
| tree | a8e57489e18dbdd620b8880eda5c8e2d77049a07 /src/gui/dialogs/dialogs.pri | |
| parent | 5e1112ec04dcef671700e326186ca56b790f7e08 (diff) | |
| parent | c390312f8fbea14ac4df0c5185ca814054f448d8 (diff) | |
| download | Qt-2b39081bf101e53a70ff056d527dc3dfb8208bf0.zip Qt-2b39081bf101e53a70ff056d527dc3dfb8208bf0.tar.gz Qt-2b39081bf101e53a70ff056d527dc3dfb8208bf0.tar.bz2 | |
Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
doc/src/declarative/righttoleft.qdoc
examples/draganddrop/fridgemagnets/main.cpp
examples/script/context2d/main.cpp
Diffstat (limited to 'src/gui/dialogs/dialogs.pri')
| -rw-r--r-- | src/gui/dialogs/dialogs.pri | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/dialogs/dialogs.pri b/src/gui/dialogs/dialogs.pri index 6ba707c..1dddb44 100644 --- a/src/gui/dialogs/dialogs.pri +++ b/src/gui/dialogs/dialogs.pri @@ -109,7 +109,11 @@ SOURCES += \ dialogs/qprintpreviewdialog.cpp symbian:contains(QT_CONFIG, s60) { - LIBS += -lCommonDialogs + contains(CONFIG, is_using_gnupoc) { + LIBS += -lcommondialogs + } else { + LIBS += -lCommonDialogs + } SOURCES += dialogs/qfiledialog_symbian.cpp \ dialogs/qcolordialog_symbian.cpp } |