diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2010-11-26 02:57:58 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-11-26 02:57:58 (GMT) |
| commit | e07f3aebda9892dcb7c21b7b867dac27e51fd039 (patch) | |
| tree | f2d77c02953cccdabdb93bf3644f86753b361a50 /src/gui/dialogs/dialogs.pri | |
| parent | 869285037c28afef45b368d30917617dabe61559 (diff) | |
| parent | 4602d75963a415d3ebe20a807aed7284b714790e (diff) | |
| download | Qt-e07f3aebda9892dcb7c21b7b867dac27e51fd039.zip Qt-e07f3aebda9892dcb7c21b7b867dac27e51fd039.tar.gz Qt-e07f3aebda9892dcb7c21b7b867dac27e51fd039.tar.bz2 | |
Merge remote branch 'qt/master'
Conflicts:
tools/qdoc3/test/qdeclarative.qdocconf
tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf
tools/qdoc3/test/qt.qdocconf
tools/qdoc3/test/qt_ja_JP.qdocconf
Diffstat (limited to 'src/gui/dialogs/dialogs.pri')
| -rw-r--r-- | src/gui/dialogs/dialogs.pri | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/gui/dialogs/dialogs.pri b/src/gui/dialogs/dialogs.pri index 574d7e4..fc1ea9e 100644 --- a/src/gui/dialogs/dialogs.pri +++ b/src/gui/dialogs/dialogs.pri @@ -109,12 +109,9 @@ SOURCES += \ dialogs/qprintpreviewdialog.cpp symbian:contains(QT_CONFIG, s60) { - LIBS += -lcommondialogs \ - -lavkon \ - -lplatformenv \ - -lefsrv \ - -lgdi - SOURCES += dialogs/qfiledialog_symbian.cpp + LIBS += -lcommondialogs + SOURCES += dialogs/qfiledialog_symbian.cpp \ + dialogs/qcolordialog_symbian.cpp } FORMS += dialogs/qpagesetupwidget.ui |