diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-02-13 15:54:46 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-02-13 15:54:46 +0100 |
| commit | 6825350037fdb31c0886f3117af0369df45954f4 (patch) | |
| tree | 15b09520ca0270ee0c9dedf86c1c31d6c9a13eac | |
| parent | e9519db3d296c096cd266bf3f5712e92915f2f3f (diff) | |
| parent | 96b807a354f65cbe2c44be10124c6f88fc82e868 (diff) | |
Merge remote-tracking branch 'origin/4.12'
Change-Id: I18d1b474cd262247d000188d3a925de617b08c1a
| -rw-r--r-- | app/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | app/main.cpp | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index ee9397c..b96a2b0 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -1,7 +1,10 @@ add_qtc_library(perfparser_lib STATIC ALLOW_ASCII_CASTS - DEPENDS Qt5::Network - PUBLIC_DEPENDS elfutils::dw elfutils::elf + PUBLIC_DEPENDS + Qt5::Core + Qt5::Network + elfutils::dw + elfutils::elf PUBLIC_INCLUDES ./ SOURCES perfaddresscache.cpp diff --git a/app/main.cpp b/app/main.cpp index 3760148..5be1667 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -80,7 +80,7 @@ int main(int argc, char *argv[]) { QCoreApplication app(argc, argv); app.setApplicationName(QLatin1String("perfparser")); - app.setApplicationVersion(QLatin1String("4.11")); + app.setApplicationVersion(QLatin1String("4.12")); if (qEnvironmentVariableIsSet("PERFPARSER_DEBUG_WAIT")) { #ifdef Q_OS_LINUX |