]> git.pld-linux.org Git - packages/psi-plus.git/blob - psi-plus-build.patch
- up to 4128; fixed build
[packages/psi-plus.git] / psi-plus-build.patch
1 --- psi-plus-0.15.4040/src/systeminfo.cpp~      2011-06-16 08:45:22.000000000 +0200
2 +++ psi-plus-0.15.4040/src/systeminfo.cpp       2011-06-16 08:49:40.974191785 +0200
3 @@ -108,7 +108,7 @@
4                 QString file;
5                 QString name;
6         } osInfo[] = {
7 -               { LinuxCustom,          OsUseFile,      ApplicationInfo::homeDir() + "/custom-os",      ""      },
8 +               { LinuxCustom,          OsUseFile,      ApplicationInfo::homeDir(ApplicationInfo::ConfigLocation) + "/custom-os",       ""      },
9  
10                 { LinuxMandrake,        OsUseFile,      "/etc/mandrake-release",        "Mandrake Linux"        },
11                 { LinuxDebian,          OsAppendFile,   "/etc/debian_version",          "Debian GNU/Linux"      },
12 --- psi-plus-0.15.4127M/src/widgets/actionlineedit.h~   2011-09-09 20:10:15.000000000 +0200
13 +++ psi-plus-0.15.4127M/src/widgets/actionlineedit.h    2011-09-09 21:25:25.369838838 +0200
14 @@ -29,6 +29,8 @@
15  
16  class QMenu;
17  
18 +static QMenu *menu_;
19 +
20  class ActionLineEditButton : public QAbstractButton
21  {
22         Q_OBJECT
23 --- psi-plus-0.15.4127M/src/widgets/actionlineedit.cpp~ 2011-09-09 20:10:15.000000000 +0200
24 +++ psi-plus-0.15.4127M/src/widgets/actionlineedit.cpp  2011-09-09 21:33:15.916458410 +0200
25 @@ -226,15 +226,3 @@
26         menu->exec(e->globalPos());
27         delete menu;
28  }
29
30 -void ActionLineEdit::contextMenuEvent(QContextMenuEvent *e)
31 -{
32 -       QMenu *menu;
33 -       if (isReadOnly()) {
34 -               menu_->exec(e->globalPos());
35 -               e->accept();
36 -       }
37 -       else {
38 -               QLineEdit::contextMenuEvent(e);
39 -       }
40 -}
This page took 0.131122 seconds and 3 git commands to generate.