diff options
| author | Toby Tomkins <toby.tomkins@nokia.com> | 2012-02-16 13:24:15 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-16 08:04:20 +0100 |
| commit | e45cb6431f2ff28e4d7bbde058684de015920dd1 (patch) | |
| tree | b02b2263fdb0867d38a87129407049a6f128e5a5 /src/designer/src/components | |
| parent | a223bcad85d982bbdd8fff239188a76ba1968a3f (diff) | |
| download | qttools-e45cb6431f2ff28e4d7bbde058684de015920dd1.tar.gz | |
Remove duplicated plugin macro to fix compilation.
Change-Id: Ie6098bc2b5e54ee1d1bef1eace05f5afe71d3c70
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/designer/src/components')
| -rw-r--r-- | src/designer/src/components/lib/qdesigner_components.cpp | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/designer/src/components/lib/qdesigner_components.cpp b/src/designer/src/components/lib/qdesigner_components.cpp index eb9a060c7..7ee3a3877 100644 --- a/src/designer/src/components/lib/qdesigner_components.cpp +++ b/src/designer/src/components/lib/qdesigner_components.cpp @@ -69,25 +69,15 @@ #include <QtCore/QFile> #include <QtCore/QFileInfo> -// ### keep it in sync with Q_IMPORT_PLUGIN in qplugin.h -#define DECLARE_PLUGIN_INSTANCE(PLUGIN) \ - extern QT_PREPEND_NAMESPACE(QObject) *qt_plugin_instance_##PLUGIN(); \ - class Static##PLUGIN##PluginInstance { public: \ - Static##PLUGIN##PluginInstance() { \ - QT_PREPEND_NAMESPACE(qRegisterStaticPluginInstanceFunction) \ - (&qt_plugin_instance_##PLUGIN); \ - } \ - }; - #define INIT_PLUGIN_INSTANCE(PLUGIN) \ do { \ Static##PLUGIN##PluginInstance instance; \ Q_UNUSED(instance); \ } while (0) -DECLARE_PLUGIN_INSTANCE(SignalSlotEditorPlugin) -DECLARE_PLUGIN_INSTANCE(BuddyEditorPlugin) -DECLARE_PLUGIN_INSTANCE(TabOrderEditorPlugin) +Q_IMPORT_PLUGIN(SignalSlotEditorPlugin) +Q_IMPORT_PLUGIN(BuddyEditorPlugin) +Q_IMPORT_PLUGIN(TabOrderEditorPlugin) static void initResources() { |