diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-08-17 13:15:14 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-08-20 07:04:36 +0000 |
| commit | 607241f63b63b610a6799f23e6006b7187d9ba29 (patch) | |
| tree | 275ff7b535e8e20b15d43e107d89965cef034e47 | |
| parent | d1e36aa9fc4184cb1d23257a4a82de9192d4266c (diff) | |
Use qtcreatordata.pri for static extensionmanager data
That updates them on modification etc
Change-Id: I2ad1c1d80df64e9e83980a31ad29e1fb3a655596
Reviewed-by: hjk <hjk@qt.io>
| -rw-r--r-- | plugins/pythonextensions/pythonextensions.pro | 7 | ||||
| -rw-r--r-- | python/python.pro | 16 | ||||
| -rw-r--r-- | pythonextensions.pro | 3 |
3 files changed, 18 insertions, 8 deletions
diff --git a/plugins/pythonextensions/pythonextensions.pro b/plugins/pythonextensions/pythonextensions.pro index 0fc3935..75a4a37 100644 --- a/plugins/pythonextensions/pythonextensions.pro +++ b/plugins/pythonextensions/pythonextensions.pro @@ -27,13 +27,6 @@ include(pythonextensions_dependencies.pri) include($$IDE_SOURCE_TREE/src/qtcreatorplugin.pri) -# Install extension manager extension during first build -copyextensions.commands = $(COPY_DIR) $$PWD/../../python $$DESTDIR/ -first.depends = $(first) copyextensions -export(first.depends) -export(copyextensions.commands) -QMAKE_EXTRA_TARGETS += first copyextensions - # Shiboken stuff # This setup is currently only tested on Linux diff --git a/python/python.pro b/python/python.pro new file mode 100644 index 0000000..5a60fb9 --- /dev/null +++ b/python/python.pro @@ -0,0 +1,16 @@ +TEMPLATE = aux + +include($$IDE_SOURCE_TREE/qtcreator.pri) + +STATIC_BASE = $$PWD +STATIC_OUTPUT_BASE = $$IDE_PLUGIN_PATH/python +STATIC_INSTALL_BASE = $$INSTALL_PLUGIN_PATH/python + +DATA_DIRS = extensionmanager + +for(data_dir, DATA_DIRS) { + files = $$files($$PWD/$$data_dir/*, true) + for(file, files): STATIC_FILES += $$file +} + +include($$IDE_SOURCE_TREE/qtcreatordata.pri) diff --git a/pythonextensions.pro b/pythonextensions.pro index 2230178..3b3723b 100644 --- a/pythonextensions.pro +++ b/pythonextensions.pro @@ -1,7 +1,8 @@ TEMPLATE = subdirs SUBDIRS += \ - plugins/pythonextensions + plugins/pythonextensions \ + python # Note: This does not yet include the # optional bindings. They have to |