diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-08-17 07:41:37 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-08-17 07:41:37 +0200 |
| commit | f440ebfd838d0b754bbba38fbbd2ccf5318f7347 (patch) | |
| tree | 53d1431ceb7d64826a86f812c4b9a4fe3310f846 /sources/pyside2/libpyside/pyside.cpp | |
| parent | 7a1fe1519159a8bcaa61aec35c1d942ed024bf73 (diff) | |
| parent | 58a0d36d9271e91bd21272a9fe3b736dd90db58d (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Icee2cd5a37181070d8ef50e7143868d4f126cea5
Diffstat (limited to 'sources/pyside2/libpyside/pyside.cpp')
| -rw-r--r-- | sources/pyside2/libpyside/pyside.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sources/pyside2/libpyside/pyside.cpp b/sources/pyside2/libpyside/pyside.cpp index c1ddfc278..66e931164 100644 --- a/sources/pyside2/libpyside/pyside.cpp +++ b/sources/pyside2/libpyside/pyside.cpp @@ -50,7 +50,6 @@ #include "pysidemetafunction_p.h" #include "pysidemetafunction.h" #include "dynamicqmetaobject.h" -#include "feature_select.h" #include <autodecref.h> #include <basewrapper.h> @@ -94,7 +93,6 @@ void init(PyObject *module) MetaFunction::init(module); // Init signal manager, so it will register some meta types used by QVariant. SignalManager::instance(); - Feature::init(); initQApp(); } |