← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/psi/jaunty

« back to all changes in this revision

Viewing changes to src/tools/trayicon/trayicon.pri

  • Committer: Bazaar Package Importer
  • Author(s): Jan Niehusmann
  • Date: 2008-04-14 18:57:30 UTC
  • mfrom: (2.1.9 hardy)
  • Revision ID: james.westby@ubuntu.com-20080414185730-528re3zp0m2hdlhi
Tags: 0.11-8
http://bugs.debian.org/476122
* added CONFIG -= link_prl to .pro files and removed dependencies
  which are made unnecessary by this change
* Fix segfault when closing last chat tab with qt4.4
  (This is from upstream svn, rev. 1101) (Closes: Bug#476122)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/tools/trayicon/trayicon.pri
1
 
trayicon {
2
 
        HEADERS += $$TRAYICON_CPP/trayicon.h
3
 
        SOURCES += $$TRAYICON_CPP/trayicon.cpp
 
1
HEADERS += $$PWD/trayicon.h
 
2
SOURCES += $$PWD/trayicon.cpp
 
3
INCLUDEPATH += $$PWD
 
4
DEPENDPATH += $$PWD
4
5
 
5
 
        unix:!mac {
6
 
                SOURCES += $$TRAYICON_CPP/trayicon_x11.cpp
7
 
        }
8
 
        win32: {
9
 
                SOURCES += $$TRAYICON_CPP/trayicon_win.cpp
10
 
        }
11
 
        mac: {
12
 
                SOURCES += $$TRAYICON_CPP/trayicon_mac.cpp
13
 
        }
 
6
unix:!mac {
 
7
        SOURCES += $$PWD/trayicon_x11.cpp
 
8
}
 
9
win32: {
 
10
        SOURCES += $$PWD/trayicon_win.cpp
 
11
}
 
12
mac: {
 
13
        SOURCES += $$PWD/trayicon_mac.cpp
14
14
}