diff options
| author | Eskil Abrahamsen Blomfeldt <[email protected]> | 2013-02-08 16:27:41 +0100 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <[email protected]> | 2013-02-08 16:31:20 +0100 |
| commit | 84f9848fd9f20536b18834a54ef15c6a65f8a682 (patch) | |
| tree | c31353dd1434692b2b4f351126b3abcd8460b8a8 /src/plugins | |
| parent | e7a8eef49d6d205e6cb549e879a27af4fe7fcce4 (diff) | |
| parent | 689406ac2424095d6cd4e6bcb3430e53a7e7bbfa (diff) | |
Merge branch 'dev' into androidwip/android
Change-Id: Iee99e20b0c2eedd01e06a93b10381c03b42788dc
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/script/qtdbus/main.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/script/qtdbus/main.h | 2 | ||||
| -rw-r--r-- | src/plugins/script/qtdbus/qtdbus.pro | 1 | ||||
| -rw-r--r-- | src/plugins/script/script.pro | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/script/qtdbus/main.cpp b/src/plugins/script/qtdbus/main.cpp index 7fd7585..b8fafbf 100644 --- a/src/plugins/script/qtdbus/main.cpp +++ b/src/plugins/script/qtdbus/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the plugins of the Qt Toolkit. diff --git a/src/plugins/script/qtdbus/main.h b/src/plugins/script/qtdbus/main.h index 6f500c4..28c4f31 100644 --- a/src/plugins/script/qtdbus/main.h +++ b/src/plugins/script/qtdbus/main.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the plugins of the Qt Toolkit. diff --git a/src/plugins/script/qtdbus/qtdbus.pro b/src/plugins/script/qtdbus/qtdbus.pro index 457af45..e37bf26 100644 --- a/src/plugins/script/qtdbus/qtdbus.pro +++ b/src/plugins/script/qtdbus/qtdbus.pro @@ -1,6 +1,7 @@ TARGET = qtscriptdbus PLUGIN_TYPE = script +PLUGIN_CLASS_NAME = QtDBusScriptPlugin load(qt_plugin) QT = core gui script diff --git a/src/plugins/script/script.pro b/src/plugins/script/script.pro index eaae56b..b8d97de 100644 --- a/src/plugins/script/script.pro +++ b/src/plugins/script/script.pro @@ -1,2 +1,2 @@ TEMPLATE = subdirs -contains(QT_CONFIG, script):contains(QT_CONFIG, dbus):SUBDIRS += qtdbus +qtHaveModule(dbus): SUBDIRS += qtdbus |