forked from qt-creator/qt-creator
Revert "compile everything with QT_USE_FAST_CONCATENATION"
This reverts commit e70530c5ad. It
did break builds on older gcc versions (gcc 4.1.2 64 bit Linux,
gcc 4.0.1 on Mac OS X):
parser/qmljsgrammar_p.h: In static member function ???static int
QmlJSGrammar::nt_action(int, int)???:
parser/qmljsgrammar_p.h:188: error: ???QmlJSGrammar::<anonymous enum>???
is/uses anonymous type
parser/qmljsgrammar_p.h:188: error: trying to instantiate
???template<class T> struct QConcatenable???
...
This commit is contained in:
@@ -139,7 +139,7 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error)
|
||||
|
||||
// FIXME shouldn't the help engine create the directory if it doesn't exist?
|
||||
const QFileInfo &fi(m_core->settings()->fileName());
|
||||
const QDir directory(fi.absolutePath() + QLatin1Literal("/qtcreator"));
|
||||
const QDir &directory(fi.absolutePath()+"/qtcreator");
|
||||
if (!directory.exists())
|
||||
directory.mkpath(directory.absolutePath());
|
||||
m_helpEngine = new QHelpEngine(directory.absolutePath() +
|
||||
@@ -976,8 +976,8 @@ void HelpPlugin::openHelpPage(const QString& url)
|
||||
} else {
|
||||
urlPrefix = QLatin1String("http://doc.trolltech.com/latest/");
|
||||
}
|
||||
QDesktopServices::openUrl(QUrl(urlPrefix + url.mid(url
|
||||
.lastIndexOf(QLatin1Char('/')) + 1)));
|
||||
QDesktopServices::openUrl(urlPrefix + url.mid(url
|
||||
.lastIndexOf(QLatin1Char('/')) + 1));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user