diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-07-06 13:55:40 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-07-06 14:08:02 +0200 |
| commit | 314fdbce8ce473eb3610be3658c61fab2fac0efb (patch) | |
| tree | 98a24a6f53ea8d6a7f3fc6ad60ab84dd66ae2863 /src/corelib/kernel/qtranslator.h | |
| parent | 8d7647e286e07690de15a6ff9189307ee1a3517c (diff) | |
| parent | 83736a8d06a6ca2a1f165d6119ddaca90646e1f8 (diff) | |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
config.tests/unix/opengldesktop/opengldesktop.cpp
examples/itemviews/interview/interview.pro
examples/mainwindows/mainwindow/mainwindow.pro
examples/openvg/README
examples/richtext/textedit/textedit.pro
examples/tools/undo/undo.pro
src/corelib/global/qglobal.h
src/corelib/kernel/qcoreapplication.h
src/corelib/kernel/qcoreevent.h
src/corelib/kernel/qmetatype.h
src/gui/kernel/qevent.cpp
src/gui/kernel/qevent.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/painting/qpaintengine_raster_p.h
src/gui/text/qfontdatabase.cpp
src/opengl/qgl.h
src/openvg/qpaintengine_vg.cpp
src/plugins/platforms/wayland/qwaylandwindow.cpp
tests/auto/qmainwindow/qmainwindow.pro
Change-Id: I6bfb586740a68379bb99f4612ec993393a5f3234
Diffstat (limited to 'src/corelib/kernel/qtranslator.h')
| -rw-r--r-- | src/corelib/kernel/qtranslator.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/corelib/kernel/qtranslator.h b/src/corelib/kernel/qtranslator.h index 495137c4cd..0a9bbde953 100644 --- a/src/corelib/kernel/qtranslator.h +++ b/src/corelib/kernel/qtranslator.h @@ -61,9 +61,6 @@ class Q_CORE_EXPORT QTranslator : public QObject Q_OBJECT public: explicit QTranslator(QObject *parent = 0); -#ifdef QT3_SUPPORT - QT3_SUPPORT_CONSTRUCTOR QTranslator(QObject * parent, const char * name); -#endif ~QTranslator(); // ### Qt 5: Merge (with "int n = -1") @@ -85,11 +82,6 @@ public: const QString & suffix = QString()); bool load(const uchar *data, int len); -#ifdef QT3_SUPPORT - QT3_SUPPORT QString find(const char *context, const char *sourceText, const char * comment = 0) const - { return translate(context, sourceText, comment); } -#endif - private: Q_DISABLE_COPY(QTranslator) Q_DECLARE_PRIVATE(QTranslator) |