sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix dbmanager resource dependency and some other warnings

Browse Source
This commit is contained in:
Juergen E. Fischer 2012-04-17 22:44:47 +02:00
parent 7fb7a64490
commit 7221eaa1f3
6 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/plugins/db_manager/CMakeLists.txt
View File

@ -1,5 +1,8 @@
SET (DB_MANAGER_PLUGIN_DIR ${QGIS_DATA_DIR}/python/plugins/db_manager)
ADD_SUBDIRECTORY(db_plugins)
ADD_SUBDIRECTORY(icons)
FILE(GLOB OTHER_FILES LICENCE README TODO)
FILE(GLOB PY_FILES *.py)
@ -12,6 +15,3 @@ INSTALL(FILES ${OTHER_FILES} DESTINATION ${DB_MANAGER_PLUGIN_DIR})
INSTALL(FILES ${PY_FILES} DESTINATION ${DB_MANAGER_PLUGIN_DIR})
INSTALL(FILES ui/__init__.py ${PYUI_FILES} DESTINATION ${DB_MANAGER_PLUGIN_DIR}/ui)
INSTALL(FILES ${PYRC_FILES} DESTINATION ${DB_MANAGER_PLUGIN_DIR})
ADD_SUBDIRECTORY(db_plugins)
ADD_SUBDIRECTORY(icons)

6
python/plugins/db_manager/db_plugins/CMakeLists.txt
View File

@ -1,5 +1,5 @@
FILE(GLOB PY_FILES *.py)
INSTALL(FILES ${PY_FILES} DESTINATION ${DB_MANAGER_PLUGIN_DIR}/db_plugins)
ADD_SUBDIRECTORY(postgis)
ADD_SUBDIRECTORY(spatialite)
FILE(GLOB PY_FILES *.py)
INSTALL(FILES ${PY_FILES} DESTINATION ${DB_MANAGER_PLUGIN_DIR}/db_plugins)

9
src/core/composer/qgscomposerscalebar.cpp
View File

@ -28,8 +28,13 @@
#include <QPainter>
#include <cmath>
QgsComposerScaleBar::QgsComposerScaleBar( QgsComposition* composition ): QgsComposerItem( composition ), mComposerMap( 0 ), mStyle( 0 ),
mNumUnitsPerSegment( 0 ), mSegmentMillimeters( 0.0 ), mAlignment( Left )
QgsComposerScaleBar::QgsComposerScaleBar( QgsComposition* composition )
: QgsComposerItem( composition )
, mComposerMap( 0 )
, mNumUnitsPerSegment( 0 )
, mStyle( 0 )
, mSegmentMillimeters( 0.0 )
, mAlignment( Left )
{
applyDefaultSettings();
applyDefaultSize();

1
src/core/qgsbrowsermodel.cpp
View File

@ -113,7 +113,6 @@ Qt::ItemFlags QgsBrowserModel::flags( const QModelIndex & index ) const
QgsDataItem* ptr = ( QgsDataItem* ) index.internalPointer();
if ( ptr->type() == QgsDataItem::Layer )
{
QgsLayerItem *layer = ( QgsLayerItem* ) ptr;
flags |= Qt::ItemIsDragEnabled;
}
if ( ptr->acceptDrop() )

2
src/core/raster/qgsrasterlayer.cpp
View File

@ -3261,8 +3261,6 @@ bool QgsRasterLayer::writeSymbology( QDomNode & layer_node, QDomDocument & docum
QStringList sl = subLayers();
QStringList sls = mDataProvider->subLayerStyles();
QStringList::const_iterator layerStyle = sls.begin();
// <mDrawingStyle>
QDomElement drawStyleElement = document.createElement( "mDrawingStyle" );
QDomText drawStyleText = document.createTextNode( drawingStyleAsString() );

8
src/ui/qgsoptionsbase.ui
View File

@ -1615,7 +1615,7 @@
<property name="title">
<string>Other settings</string>
</property>
<layout class="QGridLayout" name="gridLayout_12">
<layout class="QGridLayout" name="gridLayout_28">
<item row="0" column="0">
<widget class="QCheckBox" name="chkDisableAttributeValuesDlg">
<property name="text">
@ -1647,7 +1647,7 @@
<widget class="QComboBox" name="mValidateGeometries"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_21">
<widget class="QLabel" name="label_26">
<property name="text">
<string>Join style for curve offset</string>
</property>
@ -1657,7 +1657,7 @@
<widget class="QComboBox" name="mOffsetJoinStyleComboBox"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_22">
<widget class="QLabel" name="label_27">
<property name="text">
<string>Quadrantsegments for curve offset</string>
</property>
@ -1667,7 +1667,7 @@
<widget class="QSpinBox" name="mOffsetQuadSegSpinBox"/>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_23">
<widget class="QLabel" name="label_28">
<property name="text">
<string>Miter limit for curve offset</string>
</property>