diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:56:48 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-26 19:58:11 +0100 |
| commit | ac32e1ed4c5f83dfbef3ee5ac8b8c37852269f85 (patch) | |
| tree | 797d3dfaa4c1bdcfbfb173dfb8cdf4095b6ac0fe /examples/winextras/musicplayer/main.cpp | |
| parent | 13604e3fcc12a536d228f415ce65ca1c86b7015b (diff) | |
| parent | 894011181bc18c4d5190424f874d839e2343d387 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
examples/winextras/musicplayer/main.cpp
Change-Id: I3838d6c802e4e95d4f8985f61d8b24692b2ec916
Diffstat (limited to 'examples/winextras/musicplayer/main.cpp')
| -rw-r--r-- | examples/winextras/musicplayer/main.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/examples/winextras/musicplayer/main.cpp b/examples/winextras/musicplayer/main.cpp index 0502015..b5c4141 100644 --- a/examples/winextras/musicplayer/main.cpp +++ b/examples/winextras/musicplayer/main.cpp @@ -95,7 +95,6 @@ int main(int argc, char *argv[]) QCoreApplication::setOrganizationName(QStringLiteral("QtWinExtras")); QCoreApplication::setOrganizationDomain("qt-project.org"); QGuiApplication::setApplicationDisplayName(QStringLiteral("QtWinExtras Music Player")); - QApplication::setWindowIcon(QIcon(QStringLiteral(":/logo.png"))); if (!associateFileTypes()) return -1; |