diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-06-28 23:09:52 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-06-29 15:10:14 +0200 |
commit | 28cf5c5356e0591e3d9f31b5df1f69ce9f514ad3 (patch) | |
tree | f21add7e8afc37379e1be08839370908da1dfe37 /src/corelib/global/qglobal.cpp | |
parent | 118b3d3f8415037a1afddc6b962bd809905527d5 (diff) |
Remove QT3_SUPPORT in src/corelib/global
Change-Id: I3bda38801659125b49ef74537b22281a530b8e0a
Reviewed-on: http://codereview.qt.nokia.com/862
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Liang Qi <liang.qi@nokia.com>
Diffstat (limited to 'src/corelib/global/qglobal.cpp')
-rw-r--r-- | src/corelib/global/qglobal.cpp | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index e5626b4632..ca8b30fc00 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -2471,11 +2471,6 @@ void qCritical(const char *msg, ...) va_end(ap); } -#ifdef QT3_SUPPORT -void qSystemWarning(const char *msg, int code) - { qCritical("%s (%s)", msg, qt_error_string(code).toLocal8Bit().constData()); } -#endif // QT3_SUPPORT - void qErrnoWarning(const char *msg, ...) { // qt_error_string() will allocate anyway, so we don't have @@ -3031,54 +3026,6 @@ int qrand() with meaningful parameter names in their signatures. */ -#if defined(QT3_SUPPORT) && !defined(QT_NO_SETTINGS) -QT_BEGIN_INCLUDE_NAMESPACE -#include <qlibraryinfo.h> -QT_END_INCLUDE_NAMESPACE - -static const char *qInstallLocation(QLibraryInfo::LibraryLocation loc) -{ - static QByteArray ret; - ret = QLibraryInfo::location(loc).toLatin1(); - return ret.constData(); -} -const char *qInstallPath() -{ - return qInstallLocation(QLibraryInfo::PrefixPath); -} -const char *qInstallPathDocs() -{ - return qInstallLocation(QLibraryInfo::DocumentationPath); -} -const char *qInstallPathHeaders() -{ - return qInstallLocation(QLibraryInfo::HeadersPath); -} -const char *qInstallPathLibs() -{ - return qInstallLocation(QLibraryInfo::LibrariesPath); -} -const char *qInstallPathBins() -{ - return qInstallLocation(QLibraryInfo::BinariesPath); -} -const char *qInstallPathPlugins() -{ - return qInstallLocation(QLibraryInfo::PluginsPath); -} -const char *qInstallPathData() -{ - return qInstallLocation(QLibraryInfo::DataPath); -} -const char *qInstallPathTranslations() -{ - return qInstallLocation(QLibraryInfo::TranslationsPath); -} -const char *qInstallPathSysconf() -{ - return qInstallLocation(QLibraryInfo::SettingsPath); -} -#endif struct QInternal_CallBackTable { QVector<QList<qInternalCallback> > callbacks; |