diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-09-19 13:03:24 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-09-19 14:39:15 +0000 |
| commit | 7fe32567c75b6b9985b9efbecf74477c9e829fb2 (patch) | |
| tree | c5272470b43884c728481f63a9551f0d6974d4c6 | |
| parent | 3b0cf7c2274a46b33e21d35acdda6cfe38ea9343 (diff) | |
pyrcc: Default to Python 3
Generate all data as byte literals to work on Python 2 and 3.
Task-number: PYSIDE-328
Change-Id: I8b574bab378459e54b72792c528154ae8135b937
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | pyrcc/main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pyrcc/main.cpp b/pyrcc/main.cpp index 3baddc7..aa5ff33 100644 --- a/pyrcc/main.cpp +++ b/pyrcc/main.cpp @@ -2,7 +2,7 @@ * This file is part of the PySide Tools project. * * Copyright (C) 1992-2005 Trolltech AS. All rights reserved. - * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). + * Copyright (C) 2016 The Qt Company Ltd. * * Contact: PySide team <pyside@openbossa.org> * @@ -37,7 +37,7 @@ // Some static globals static QString initName; static bool verbose = false; -static int py_version = 2; +static int py_version = 3; static int compressLevel = CONSTANT_COMPRESSLEVEL_DEFAULT; static int compressThreshold = CONSTANT_COMPRESSTHRESHOLD_DEFAULT; static QString resourceRoot; @@ -97,8 +97,8 @@ int showHelp(const char *argv0, const QString &error) fprintf(stderr, "Usage: %s [options] <inputs>\n\n" "Options:\n" " -o file Write output to file rather than stdout\n" - " -py2 Generate code for any Python v2.x version (default)\n" - " -py3 Generate code for any Python v3.x version\n" + " -py2 Generate code for any Python v2.x version\n" + " -py3 Generate code for any Python v3.x version (default)\n" " -name name Create an external initialization function with name\n" " -threshold level Threshold to consider compressing files\n" " -compress level Compress input files by level\n" |