Skip to content

Commit 0aa326b

Browse files
committed
Enable webview tools and fix some minor dox issues
1 parent 90ea199 commit 0aa326b

File tree

4 files changed

+5
-17
lines changed

4 files changed

+5
-17
lines changed

python/core/auto_generated/qgsattributeeditorelement.sip.in

+2-6
Original file line numberDiff line numberDiff line change
@@ -395,9 +395,7 @@ The QML code that will be represented within this widget.
395395

396396
void setQmlCode( const QString &qmlCode );
397397
%Docstring
398-
The QML code that will be represented within this widget.
399-
400-
@param qmlCode
398+
Sets the QML code that will be represented within this widget to ``qmlCode``.
401399
%End
402400

403401
};
@@ -436,9 +434,7 @@ The QML code that will be represented within this widget.
436434

437435
void setHtmlCode( const QString &htmlCode );
438436
%Docstring
439-
The HTML code that will be represented within this widget.
440-
441-
@param htmlCode
437+
Sets the HTML code that will be represented within this widget to ``htmlCode``.
442438
%End
443439

444440
};

src/core/qgsattributeeditorelement.h

+2-6
Original file line numberDiff line numberDiff line change
@@ -459,9 +459,7 @@ class CORE_EXPORT QgsAttributeEditorQmlElement : public QgsAttributeEditorElemen
459459
QString qmlCode() const;
460460

461461
/**
462-
* The QML code that will be represented within this widget.
463-
*
464-
* @param qmlCode
462+
* Sets the QML code that will be represented within this widget to \a qmlCode.
465463
*/
466464
void setQmlCode( const QString &qmlCode );
467465

@@ -502,9 +500,7 @@ class CORE_EXPORT QgsAttributeEditorHtmlElement : public QgsAttributeEditorEleme
502500
QString htmlCode() const;
503501

504502
/**
505-
* The HTML code that will be represented within this widget.
506-
*
507-
* @param htmlCode
503+
* Sets the HTML code that will be represented within this widget to \a htmlCode.
508504
*/
509505
void setHtmlCode( const QString &htmlCode );
510506

src/gui/editorwidgets/qgshtmlwidgetwrapper.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,7 @@ void QgsHtmlWidgetWrapper::setHtmlContext( )
8383

8484
HtmlExpression *htmlExpression = new HtmlExpression();
8585
htmlExpression->setExpressionContext( expressionContext );
86-
87-
#ifdef QGISDEBUG
8886
mWidget->page()->settings()->setAttribute( QWebSettings::DeveloperExtrasEnabled, true );
89-
#endif
90-
9187
auto frame = mWidget->page()->mainFrame();
9288
connect( frame, &QWebFrame::javaScriptWindowObjectCleared, [ = ]
9389
{

src/gui/editorwidgets/qgshtmlwidgetwrapper.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class GUI_EXPORT QgsHtmlWidgetWrapper : public QgsWidgetWrapper
5858

5959
private slots:
6060
//! sets the html context with the current values
61-
void setHtmlContext();
61+
void setHtmlContext( );
6262

6363
private:
6464
QString mHtmlCode;

0 commit comments

Comments
 (0)