diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-04-20 13:32:37 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-04-20 13:32:59 +0200 |
| commit | 2269be6b23d3a34db955471a975a34ad8e97761c (patch) | |
| tree | 28192a56cc83398cc30cfe33d3f5b3be06496e31 | |
| parent | ad85c747fc905d75570d9c255e8f76ae020f3d0b (diff) | |
| parent | ac293941901873a5ebbc3dc8ee98d37412777061 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I7e3013f2695036079ebb1acc60484ab7b7d62b3f
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | pyside2uic/__init__.py.in | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c02384..d328654 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.1) project(pyside2-tools) find_package(Shiboken2 2.0.0 REQUIRED) diff --git a/pyside2uic/__init__.py.in b/pyside2uic/__init__.py.in index 6e06e72..8d48844 100644 --- a/pyside2uic/__init__.py.in +++ b/pyside2uic/__init__.py.in @@ -28,7 +28,8 @@ from pyside2uic.Compiler import indenter, compiler _header = """# -*- coding: utf-8 -*- -# Form implementation generated from reading ui file '%s' +# Form implementation generated from reading ui file '%s', +# licensing of '%s' applies. # # Created: %s # by: pyside2-uic %s running on PySide2 %s @@ -137,7 +138,7 @@ def compileUi(uifile, pyfile, execute=False, indent=4, from_imports=False): indenter.indentwidth = indent global PySideToolsVersion - pyfile.write(_header % (uifname, ctime(), __version__, PySide2.__version__)) + pyfile.write(_header % (uifname, uifname, ctime(), __version__, PySide2.__version__)) winfo = compiler.UICompiler().compileUi(uifile, pyfile, from_imports) |