diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-03 10:58:56 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-03 10:58:56 +0200 |
| commit | 5b6a81d8349c2cdff7787de7aaa396722bc60420 (patch) | |
| tree | 7f92649cd19f775c8e91c53f84d131d94a6ae470 /src | |
| parent | f281054d12b53b95df3926e54ac6a99ecf9bc3ca (diff) | |
| parent | 91394cccb942df1b5699b0d9d69de9ecc6ced86a (diff) | |
| download | qtquick1-5b6a81d8349c2cdff7787de7aaa396722bc60420.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I436c6ecbac500eb2b7836c7b29756972ee9e14df
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/qdeclarativeview/qdeclarativeview.pro | 2 | ||||
| -rw-r--r-- | src/plugins/qdeclarativeview/qdeclarativeview_plugin.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qdeclarativeview/qdeclarativeview.pro b/src/plugins/qdeclarativeview/qdeclarativeview.pro index 8c3559c3..2c8fb918 100644 --- a/src/plugins/qdeclarativeview/qdeclarativeview.pro +++ b/src/plugins/qdeclarativeview/qdeclarativeview.pro @@ -1,5 +1,5 @@ TARGET = qdeclarativeview -QT += declarative widgets designer +QT += declarative widgets uiplugin PLUGIN_TYPE = designer PLUGIN_CLASS_NAME = QDeclarativeViewPlugin diff --git a/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h b/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h index 5af85879..82e2b36b 100644 --- a/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h +++ b/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h @@ -34,7 +34,7 @@ #ifndef QDECLARATIVEVIEW_PLUGIN_H #define QDECLARATIVEVIEW_PLUGIN_H -#include <QtDesigner/QDesignerCustomWidgetInterface> +#include <QtUiPlugin/QDesignerCustomWidgetInterface> QT_BEGIN_NAMESPACE |