diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-05-06 08:55:43 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-05-06 08:56:27 +0200 |
| commit | 283e1ce2fbbb729b0e5d117ddbea190827ef7144 (patch) | |
| tree | af1977894d146f20f3010e600dd289d3839bc0bc | |
| parent | f769dcb3d1d030a858b496ea8e77eb9cafae225f (diff) | |
| parent | 25ddba75f0767ef1150c3896fde5c50bc65147c9 (diff) | |
Merge remote-tracking branch 'origin/4.9'
Change-Id: I08cbfa6e80c8e75f756e22ea57e39c61f8678c49
| -rw-r--r-- | app/main.cpp | 8 | ||||
| -rw-r--r-- | perfparser.pro | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/app/main.cpp b/app/main.cpp index 0c677cb..79978ee 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -236,10 +236,14 @@ int main(int argc, char *argv[]) parser.value(port).toUShort()); infile.reset(socket); } else { - if (parser.isSet(input)) + if (parser.isSet(input)) { infile.reset(new QFile(parser.value(input))); - else + } else { +#ifdef Q_OS_WIN + _setmode(fileno(stdin), O_BINARY); +#endif infile.reset(new PerfStdin); + } } bool ok = false; diff --git a/perfparser.pro b/perfparser.pro index 634df3d..3ce4ede 100644 --- a/perfparser.pro +++ b/perfparser.pro @@ -43,7 +43,7 @@ exists($$ELFUTILS_INCLUDE_DIR/libdwfl.h)|exists($$ELFUTILS_INCLUDE_DIR/elfutils/ INSTALLS += inst_backends inst_elfutils - deploy.depends = install_inst_elfutils install_inst_backends + deployqt.depends = install_inst_elfutils install_inst_backends linux { RPATH = $$relative_path($$PERFPARSER_ELFUTILS_BACKENDS_INSTALLDIR, \ @@ -51,7 +51,7 @@ exists($$ELFUTILS_INCLUDE_DIR/libdwfl.h)|exists($$ELFUTILS_INCLUDE_DIR/elfutils/ fix_dw_rpath.commands = chrpath -r \'\$\$ORIGIN/$$RPATH\' \ $$PERFPARSER_ELFUTILS_INSTALLDIR/$$elfutilsLibraryName(dw, 1) fix_dw_rpath.depends = install_inst_elfutils - deploy.depends += fix_dw_rpath + deployqt.depends += fix_dw_rpath QMAKE_EXTRA_TARGETS += fix_dw_rpath install_inst_elfutils } } @@ -61,4 +61,4 @@ exists($$ELFUTILS_INCLUDE_DIR/libdwfl.h)|exists($$ELFUTILS_INCLUDE_DIR/elfutils/ OTHER_FILES += perfparser.qbs -QMAKE_EXTRA_TARGETS += deploy docs install_docs +QMAKE_EXTRA_TARGETS += deployqt docs install_docs |