diff options
| author | Valerio Valerio <valerio.valerio@jollamobile.com> | 2013-05-02 12:11:31 +0300 |
|---|---|---|
| committer | Valerio Valerio <valerio.valerio@jollamobile.com> | 2013-05-06 11:40:36 +0200 |
| commit | 9fd25ba679de1d141e87046b10cd7165b2ea15e3 (patch) | |
| tree | 4efac4375ad48c7b6ba1ded63432f912f361bf0f | |
| parent | 2c26e21e4dc809808141660cda268b4c5a7837b7 (diff) | |
Update Qt5 port.
Fix docs generation.
Fix build when using libicu support.
Signed-off-by: Valerio Valerio <valerio.valerio@jollamobile.com>
Change-Id: Ice1c42493857129f5651a43aebe125257e47f8d3
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
| -rw-r--r-- | doc/src/doc.pri | 6 | ||||
| -rw-r--r-- | src/libraries/qmfclient/support/qcharsetdetector.cpp | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/doc/src/doc.pri b/doc/src/doc.pri index 784c8818..7d21398a 100644 --- a/doc/src/doc.pri +++ b/doc/src/doc.pri @@ -1,4 +1,5 @@ -QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc3) +equals(QT_MAJOR_VERSION, 4): QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc3) +equals(QT_MAJOR_VERSION, 5): QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc) HELPGENERATOR = $$targetPath($$[QT_INSTALL_BINS]/qhelpgenerator) equals(QMAKE_DIR_SEP, /) { # unix, mingw+msys @@ -33,7 +34,8 @@ qch_docs.depends += html_docs qch_docs.files = $$QCH_FILE unix:!macx { - qch_docs.path = $$QMF_INSTALL_ROOT/share/doc/qmf/qch + equals(QT_MAJOR_VERSION, 4): qch_docs.path = $$QMF_INSTALL_ROOT/share/doc/qmf/qch + equals(QT_MAJOR_VERSION, 5): qch_docs.path = $$QMF_INSTALL_ROOT/share/doc/qmf-qt5/qch qch_docs.CONFIG += no_check_exist } diff --git a/src/libraries/qmfclient/support/qcharsetdetector.cpp b/src/libraries/qmfclient/support/qcharsetdetector.cpp index b33641a4..de0c37ef 100644 --- a/src/libraries/qmfclient/support/qcharsetdetector.cpp +++ b/src/libraries/qmfclient/support/qcharsetdetector.cpp @@ -338,7 +338,7 @@ QList<QCharsetMatch> QCharsetDetector::detectAll() for (qint32 i = 0; i < matchesFound; ++i) { QCharsetMatch qCharsetMatch; qCharsetMatch.setName( - QString::fromAscii(ucsdet_getName(uCharsetMatch[i], &(d->_status)))); + QString::fromLatin1(ucsdet_getName(uCharsetMatch[i], &(d->_status)))); if(hasError()) { qWarning() << __PRETTY_FUNCTION__ << errorString(); return QList<QCharsetMatch>(); @@ -350,7 +350,7 @@ QList<QCharsetMatch> QCharsetDetector::detectAll() return QList<QCharsetMatch>(); } qCharsetMatch.setLanguage( - QString::fromAscii(ucsdet_getLanguage(uCharsetMatch[i], &(d->_status)))); + QString::fromLatin1(ucsdet_getLanguage(uCharsetMatch[i], &(d->_status)))); if(hasError()) { qWarning() << __PRETTY_FUNCTION__ << errorString(); return QList<QCharsetMatch>(); @@ -615,7 +615,7 @@ QString QCharsetDetector::text(const QCharsetMatch &charsetMatch) Q_D(QCharsetDetector); clearError(); QTextCodec *codec - = QTextCodec::codecForName(charsetMatch.name().toAscii()); + = QTextCodec::codecForName(charsetMatch.name().toLatin1()); if (codec == NULL) { // there is no codec matching the name d->_status = U_ILLEGAL_ARGUMENT_ERROR; qWarning() << __PRETTY_FUNCTION__ @@ -649,7 +649,7 @@ void QCharsetDetector::setDeclaredEncoding(const QString &encoding) if (d->_declaredEncoding == QLatin1String("GB2312")) d->_declaredEncoding = QLatin1String("GB18030"); ucsdet_setDeclaredEncoding(d->_uCharsetDetector, - d->_declaredEncoding.toAscii().constData(), + d->_declaredEncoding.toLatin1().constData(), int32_t(-1), &(d->_status)); if(hasError()) |