diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-03-12 21:03:49 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-03-12 21:03:49 +0100 |
| commit | d5098f2802255da10b749b93705084ad1fdfc6a5 (patch) | |
| tree | 6462008a4ab7d13435d93490fed96c62c516cbdf /src/widgets/util/util.pri | |
| parent | d5a85940f785459d7b982d5fdf59a9fd18825092 (diff) | |
| parent | b5b41c18345719612e5411cc482466d2dbafdaf7 (diff) | |
Merge remote-tracking branch 'origin/master' into api_changes
Conflicts:
tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
Change-Id: I884afc3b6d65c6411733a897a1949e19393573a7
Diffstat (limited to 'src/widgets/util/util.pri')
| -rw-r--r-- | src/widgets/util/util.pri | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/widgets/util/util.pri b/src/widgets/util/util.pri index abfb1d86fe..16765558f6 100644 --- a/src/widgets/util/util.pri +++ b/src/widgets/util/util.pri @@ -25,8 +25,13 @@ SOURCES += \ util/qflickgesture.cpp \ util/qundogroup.cpp \ util/qundostack.cpp \ - util/qundoview.cpp \ - util/qsystemtrayicon_qpa.cpp + util/qundoview.cpp + +win32:!wince* { + SOURCES += util/qsystemtrayicon_win.cpp +} else { + SOURCES += util/qsystemtrayicon_qpa.cpp +} # TODO false:!x11:mac { |