1 |
wired 10/10/09 20:26:39 |
2 |
|
3 |
Added: qt-assistant-4.7-include.tar.gz |
4 |
qt-assistant-4.7-fix-compat.patch |
5 |
Log: |
6 |
added optional compatibility package support |
7 |
|
8 |
(Portage version: 2.2_rc89/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 x11-libs/qt-assistant/files/qt-assistant-4.7-include.tar.gz |
12 |
|
13 |
<<Binary file>> |
14 |
|
15 |
|
16 |
1.1 x11-libs/qt-assistant/files/qt-assistant-4.7-fix-compat.patch |
17 |
|
18 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/files/qt-assistant-4.7-fix-compat.patch?rev=1.1&view=markup |
19 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/files/qt-assistant-4.7-fix-compat.patch?rev=1.1&content-type=text/plain |
20 |
|
21 |
Index: qt-assistant-4.7-fix-compat.patch |
22 |
=================================================================== |
23 |
--- tools/assistant/compat/compat.pro 2010-10-08 16:54:09.804000000 +0300 |
24 |
+++ tools/assistant/compat/compat.pro 2010-10-08 16:54:37.884000000 +0300 |
25 |
@@ -14,6 +14,8 @@ |
26 |
|
27 |
PROJECTNAME = Assistant |
28 |
|
29 |
+DESTDIR = ../../../bin |
30 |
+ |
31 |
FORMS += helpdialog.ui \ |
32 |
mainwindow.ui \ |
33 |
tabbedbrowser.ui \ |
34 |
@@ -59,6 +61,9 @@ |
35 |
TARGET = Assistant_adp |
36 |
} |
37 |
|
38 |
+target.path=$$[QT_INSTALL_BINS] |
39 |
+INSTALLS += target |
40 |
+ |
41 |
TRANSLATIONS = translations/assistant_adp_de.ts \ |
42 |
translations/assistant_adp_ja.ts \ |
43 |
translations/assistant_adp_pl.ts \ |
44 |
--- tools/assistant/assistant.pro 2010-09-10 12:04:47.000000000 +0300 |
45 |
+++ tools/assistant/assistant.pro 2010-06-02 05:03:09.000000000 +0300 |
46 |
@@ -3,4 +3,6 @@ |
47 |
|
48 |
SUBDIRS += lib/fulltextsearch \ |
49 |
lib \ |
50 |
- tools |
51 |
+ tools \ |
52 |
+ compat \ |
53 |
+ compat/lib \ |
54 |
\ No newline at end of file |
55 |
--- /dev/null |
56 |
+++ tools/assistant/compat/lib/QtAssistant/qassistantclient_global.h |
57 |
@@ -0,0 +1 @@ |
58 |
+#include "../qassistantclient_global.h" |
59 |
--- /dev/null 2010-09-28 21:07:22.854999850 +0300 |
60 |
+++ tools/assistant/compat/assistant.pro 2010-06-02 05:03:09.000000000 +0300 |
61 |
@@ -0,0 +1,84 @@ |
62 |
+include($$QT_SOURCE_TREE/tools/shared/fontpanel/fontpanel.pri) |
63 |
+ |
64 |
+TEMPLATE = app |
65 |
+LANGUAGE = C++ |
66 |
+TARGET = assistant_adp |
67 |
+ |
68 |
+CONFIG += qt warn_on |
69 |
+ |
70 |
+unix:contains(QT_CONFIG, dbus):QT += dbus |
71 |
+ |
72 |
+build_all:!build_pass { |
73 |
+ CONFIG -= build_all |
74 |
+ CONFIG += release |
75 |
+} |
76 |
+QT += xml network |
77 |
+ |
78 |
+PROJECTNAME = Assistant |
79 |
+DESTDIR = ../../../bin |
80 |
+ |
81 |
+FORMS += helpdialog.ui \ |
82 |
+ mainwindow.ui \ |
83 |
+ tabbedbrowser.ui \ |
84 |
+ topicchooser.ui |
85 |
+ |
86 |
+SOURCES += main.cpp \ |
87 |
+ helpwindow.cpp \ |
88 |
+ topicchooser.cpp \ |
89 |
+ docuparser.cpp \ |
90 |
+ index.cpp \ |
91 |
+ profile.cpp \ |
92 |
+ config.cpp \ |
93 |
+ helpdialog.cpp \ |
94 |
+ mainwindow.cpp \ |
95 |
+ tabbedbrowser.cpp \ |
96 |
+ fontsettingsdialog.cpp |
97 |
+ |
98 |
+HEADERS += helpwindow.h \ |
99 |
+ topicchooser.h \ |
100 |
+ docuparser.h \ |
101 |
+ index.h \ |
102 |
+ profile.h \ |
103 |
+ helpdialog.h \ |
104 |
+ mainwindow.h \ |
105 |
+ tabbedbrowser.h \ |
106 |
+ config.h \ |
107 |
+ fontsettingsdialog.h |
108 |
+ |
109 |
+RESOURCES += assistant.qrc |
110 |
+ |
111 |
+contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE |
112 |
+DEFINES += QT_KEYWORDS |
113 |
+#DEFINES += QT_PALMTOPCENTER_DOCS |
114 |
+ |
115 |
+win32 { |
116 |
+ !wince*:LIBS += -lshell32 |
117 |
+ RC_FILE = assistant.rc |
118 |
+} |
119 |
+ |
120 |
+mac { |
121 |
+ ICON = assistant.icns |
122 |
+ TARGET = Assistant_adp |
123 |
+ QMAKE_INFO_PLIST = Info_mac.plist |
124 |
+} |
125 |
+ |
126 |
+target.path=$$[QT_INSTALL_BINS] |
127 |
+INSTALLS += target |
128 |
+ |
129 |
+TRANSLATIONS = assistant_de.ts |
130 |
+ |
131 |
+unix:!contains(QT_CONFIG, zlib):LIBS += -lz |
132 |
+ |
133 |
+contains(CONFIG, static): { |
134 |
+ win32 { |
135 |
+ exists($$[QT_INSTALL_PLUGINS]/imageformats/qjpeg.lib) { |
136 |
+ QTPLUGIN += qjpeg |
137 |
+ DEFINES += USE_STATIC_JPEG_PLUGIN |
138 |
+ } |
139 |
+ } else { |
140 |
+ exists($$[QT_INSTALL_PLUGINS]/imageformats/qjpeg.a) { |
141 |
+ QTPLUGIN += qjpeg |
142 |
+ DEFINES += USE_STATIC_JPEG_PLUGIN |
143 |
+ } |
144 |
+ } |
145 |
+} |