diff options
| author | Felix (xq) Queißner <git@mq32.de> | 2020-06-21 14:49:25 +0200 |
|---|---|---|
| committer | Felix (xq) Queißner <git@mq32.de> | 2020-06-21 14:49:25 +0200 |
| commit | 0cd3f649205dd079843914d2977a650dd9bd3a92 (patch) | |
| tree | ff934cd5a2d7131e17679f32a4a38cd1ec559b66 /src | |
| parent | 3219eda19bf596287d665e7709b728af0ef8de2f (diff) | |
| download | kristall-0cd3f649205dd079843914d2977a650dd9bd3a92.tar.gz | |
Removes deprecation warning for setTabStopWidth, tries to fix netbsd build.
Diffstat (limited to 'src')
| -rw-r--r-- | src/browsertab.cpp | 10 | ||||
| -rw-r--r-- | src/browsertab.ui | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/browsertab.cpp b/src/browsertab.cpp index 041f886..49456f1 100644 --- a/src/browsertab.cpp +++ b/src/browsertab.cpp @@ -62,6 +62,12 @@ BrowserTab::BrowserTab(MainWindow *mainWindow) : QWidget(nullptr), this->ui->graphics_browser->setVisible(false); this->ui->text_browser->setVisible(true); +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + this->ui->text_browser->setTabStopDistance(40); +#else + this->ui->text_browser->setTabStopWidth(40); +#endif + this->ui->text_browser->setContextMenuPolicy(Qt::CustomContextMenu); connect(this->ui->url_bar, &SearchBar::escapePressed, this, &BrowserTab::on_url_bar_escapePressed); @@ -269,7 +275,7 @@ static QByteArray convertToUtf8(QByteArray const & input, QString const & charSe char temp_buffer[4096]; - char const * input_ptr = reinterpret_cast<char const *>(input.data()); + char * input_ptr = const_cast<char *>(reinterpret_cast<char const *>(input.data())); size_t input_size = input.size(); while(input_size > 0) @@ -277,7 +283,7 @@ static QByteArray convertToUtf8(QByteArray const & input, QString const & charSe char * out_ptr = temp_buffer; size_t out_size = sizeof(temp_buffer); - size_t n = iconv(cd, const_cast<char **>(&input_ptr), &input_size, &out_ptr, &out_size); + size_t n = iconv(cd, &input_ptr, &input_size, &out_ptr, &out_size); if (n == size_t(-1)) { if(errno == E2BIG) { diff --git a/src/browsertab.ui b/src/browsertab.ui index fac9184..c7c7354 100644 --- a/src/browsertab.ui +++ b/src/browsertab.ui @@ -173,9 +173,6 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Start surfin!</p></body></html></string> </property> - <property name="tabStopWidth"> - <number>40</number> - </property> <property name="openLinks"> <bool>false</bool> </property> |