diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:53:11 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:53:11 +0100 |
| commit | c5159ecfc36bc0f9bff45de78accd104b9637066 (patch) | |
| tree | f63ce3effc703e23fb3f5e9ae3880e5759dfe8b0 /examples/winextras/musicplayer/musicplayer.pro | |
| parent | 210b31fa48134ace767be47508b9918bcee9a22d (diff) | |
| parent | 1b8836e00da53872bd3c285e5ab5ac8344ccd46c (diff) | |
Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1
Conflicts:
.qmake.conf
src/imports/winextras/qquickjumplist.cpp
Change-Id: I2272b873c872bbabf7e274a478e3d16b92cdb434
Diffstat (limited to 'examples/winextras/musicplayer/musicplayer.pro')
| -rw-r--r-- | examples/winextras/musicplayer/musicplayer.pro | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/examples/winextras/musicplayer/musicplayer.pro b/examples/winextras/musicplayer/musicplayer.pro index 73968cf..ae8f4eb 100644 --- a/examples/winextras/musicplayer/musicplayer.pro +++ b/examples/winextras/musicplayer/musicplayer.pro @@ -12,10 +12,7 @@ SOURCES = \ musicplayer.cpp \ volumebutton.cpp -RESOURCES += \ - musicplayer.qrc - -RC_ICONS = images/musicplayer.ico +RC_ICONS = images/qt-logo.ico target.path = $$[QT_INSTALL_EXAMPLES]/winextras/musicplayer INSTALLS += target |