Skip to content

Commit 1cbcf49

Browse files
committed
include db2 provider in packaging
1 parent d8dbc92 commit 1cbcf49

File tree

8 files changed

+163
-261
lines changed

8 files changed

+163
-261
lines changed

debian/qgis-providers.install.in

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ usr/lib/qgis/plugins/libgpxprovider.so
66
usr/lib/qgis/plugins/libidentcertauthmethod.so
77
usr/lib/qgis/plugins/libmemoryprovider.so
88
usr/lib/qgis/plugins/libmssqlprovider.so
9+
usr/lib/qgis/plugins/libdb2provider.so
910
usr/lib/qgis/plugins/libogrprovider.so
1011
usr/lib/qgis/plugins/libowsprovider.so
1112
usr/lib/qgis/plugins/libpkcs12authmethod.so

doc/CONTRIBUTORS

+3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ Carson J. Q. Farmer
1919
Christian Ferreira
2020
Cédric Möri
2121
Daniel Vaz
22+
David Adler
23+
David Nguyen
2224
Denis Rouzaud
2325
Diego Moreira
2426
Duarte Carreira
@@ -65,6 +67,7 @@ Richard Kostecky
6567
Robert Szczepanek
6668
Salvatore Larosa
6769
Sebastian Dietrich
70+
Shirley Xiao
6871
Stefanie Tellex
6972
Steven Mizuno
7073
Tamas Szekeres

images/images.qrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
<file>themes/default/mActionAddMap.png</file>
133133
<file>themes/default/mActionAddMap.svg</file>
134134
<file>themes/default/mActionAddMssqlLayer.svg</file>
135-
<file>themes/default/mActionAddDb2Layer.svg</file>
135+
<file>themes/default/mActionAddDb2Layer.svg</file>
136136
<file>themes/default/mActionAddNonDbLayer.png</file>
137137
<file>themes/default/mActionAddOgrLayer.svg</file>
138138
<file>themes/default/mActionAddOracleLayer.svg</file>

ms-windows/osgeo4w/package.cmd

+1
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,7 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%-common/%PACKAGENAME
309309
"apps/%PACKAGENAME%/plugins/identcertauthmethod.dll" ^
310310
"apps/%PACKAGENAME%/plugins/memoryprovider.dll" ^
311311
"apps/%PACKAGENAME%/plugins/mssqlprovider.dll" ^
312+
"apps/%PACKAGENAME%/plugins/db2provider.dll" ^
312313
"apps/%PACKAGENAME%/plugins/ogrprovider.dll" ^
313314
"apps/%PACKAGENAME%/plugins/owsprovider.dll" ^
314315
"apps/%PACKAGENAME%/plugins/pkcs12authmethod.dll" ^

python/plugins/processing/ui/widgetNumberSelector.ui

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<extends>QDoubleSpinBox</extends>
5252
<header>qgis.gui</header>
5353
<container>1</container>
54-
</customwidget>
54+
</customwidget>
5555
</customwidgets>
5656
<resources/>
5757
<connections/>

src/ui/qgisapp.ui

+3-3
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
<addaction name="mActionAddPgLayer"/>
149149
<addaction name="mActionAddSpatiaLiteLayer"/>
150150
<addaction name="mActionAddMssqlLayer"/>
151-
<addaction name="mActionAddDb2Layer"/>
151+
<addaction name="mActionAddDb2Layer"/>
152152
<addaction name="mActionAddOracleLayer"/>
153153
<addaction name="mActionAddWmsLayer"/>
154154
<addaction name="mActionAddLayerSeparator"/>
@@ -340,7 +340,7 @@
340340
<addaction name="mActionAddPgLayer"/>
341341
<addaction name="mActionAddSpatiaLiteLayer"/>
342342
<addaction name="mActionAddMssqlLayer"/>
343-
<addaction name="mActionAddDb2Layer"/>
343+
<addaction name="mActionAddDb2Layer"/>
344344
<addaction name="mActionAddOracleLayer"/>
345345
<addaction name="mActionAddWmsLayer"/>
346346
<addaction name="mActionAddWcsLayer"/>
@@ -1350,7 +1350,7 @@
13501350
<property name="shortcut">
13511351
<string>Ctrl+Shift+2</string>
13521352
</property>
1353-
</action>
1353+
</action>
13541354
<action name="mActionAddOracleLayer">
13551355
<property name="icon">
13561356
<iconset resource="../../images/images.qrc">

0 commit comments

Comments
 (0)