mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-24 12:46:35 +01:00
Last edits for before releasing 0.9.8 version
This commit is contained in:
parent
989fb92d4a
commit
a29bfcf847
5
README
5
README
@ -3,7 +3,8 @@
|
|||||||
#################################
|
#################################
|
||||||
Version: 0.9.8
|
Version: 0.9.8
|
||||||
|
|
||||||
QupZilla is new and very fast browser based on WebKit core http://www.webkit.org
|
QupZilla is new and very fast open source browser based on WebKit core http://www.webkit.org
|
||||||
Written in Qt Framework http://qt.nokia.com
|
Written in Qt Framework http://qt.nokia.com
|
||||||
|
|
||||||
More informations at http://www.qupzilla.ic.cz (Czech only)
|
English wiki at https://github.com/nowrep/QupZilla/wiki
|
||||||
|
More informations and download at http://www.qupzilla.ic.cz (Czech only)
|
||||||
|
2
src/3rdparty/qtlocalpeer.cpp
vendored
2
src/3rdparty/qtlocalpeer.cpp
vendored
@ -191,7 +191,7 @@ void QtLocalPeer::receiveConnection()
|
|||||||
uMsgBuf += got;
|
uMsgBuf += got;
|
||||||
} while (remaining && got >= 0 && socket->waitForReadyRead(2000));
|
} while (remaining && got >= 0 && socket->waitForReadyRead(2000));
|
||||||
if (got < 0) {
|
if (got < 0) {
|
||||||
qWarning() << "QtLocalPeer: Message reception failed" << socket->errorString();
|
qWarning(QString("QtLocalPeer: Message reception failed "+socket->errorString()).toLocal8Bit());
|
||||||
delete socket;
|
delete socket;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -17,7 +17,9 @@ MOC_DIR = ../build
|
|||||||
RCC_DIR = ../build
|
RCC_DIR = ../build
|
||||||
UI_DIR = ../build
|
UI_DIR = ../build
|
||||||
|
|
||||||
!CONFIG(debug, debug|release): DEFINES += QT_NO_DEBUG_OUTPUT
|
##It won't compile on windows with this define
|
||||||
|
##Some bug in qtsingleapp / qvector template
|
||||||
|
!win32: !CONFIG(debug, debug|release): DEFINES += QT_NO_DEBUG_OUTPUT
|
||||||
|
|
||||||
INCLUDEPATH += 3rdparty\
|
INCLUDEPATH += 3rdparty\
|
||||||
app\
|
app\
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
#define QUPZILLA_H
|
#define QUPZILLA_H
|
||||||
|
|
||||||
//Comment for release building
|
//Comment for release building
|
||||||
#define DEVELOPING
|
//#define DEVELOPING
|
||||||
//Check if i don't fuck anything
|
//Check if i don't fuck anything
|
||||||
|
|
||||||
#ifdef QT_NO_DEBUG
|
#ifdef QT_NO_DEBUG
|
||||||
|
@ -67,9 +67,6 @@
|
|||||||
</property>
|
</property>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QProgressBar" name="progressBar">
|
<widget class="QProgressBar" name="progressBar">
|
||||||
<property name="styleSheet">
|
|
||||||
<string notr="true"/>
|
|
||||||
</property>
|
|
||||||
<property name="maximum">
|
<property name="maximum">
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
@ -97,16 +94,16 @@
|
|||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
<customwidgets>
|
<customwidgets>
|
||||||
<customwidget>
|
|
||||||
<class>SqueezeLabel</class>
|
|
||||||
<extends>QLabel</extends>
|
|
||||||
<header>squeezelabel.h</header>
|
|
||||||
</customwidget>
|
|
||||||
<customwidget>
|
<customwidget>
|
||||||
<class>ClickableLabel</class>
|
<class>ClickableLabel</class>
|
||||||
<extends>QLabel</extends>
|
<extends>QLabel</extends>
|
||||||
<header>clickablelabel.h</header>
|
<header>clickablelabel.h</header>
|
||||||
</customwidget>
|
</customwidget>
|
||||||
|
<customwidget>
|
||||||
|
<class>SqueezeLabel</class>
|
||||||
|
<extends>QLabel</extends>
|
||||||
|
<header>squeezelabel.h</header>
|
||||||
|
</customwidget>
|
||||||
</customwidgets>
|
</customwidgets>
|
||||||
<resources/>
|
<resources/>
|
||||||
<connections/>
|
<connections/>
|
||||||
|
@ -50,7 +50,7 @@ void ClearPrivateData::dialogAccepted()
|
|||||||
if (ui->history->isChecked()) {
|
if (ui->history->isChecked()) {
|
||||||
QDateTime dateTime = QDateTime::currentDateTime();
|
QDateTime dateTime = QDateTime::currentDateTime();
|
||||||
qint64 nowMS = QDateTime::currentMSecsSinceEpoch();
|
qint64 nowMS = QDateTime::currentMSecsSinceEpoch();
|
||||||
qint64 date;
|
qint64 date = 0;
|
||||||
|
|
||||||
switch (ui->historyLength->currentIndex()) {
|
switch (ui->historyLength->currentIndex()) {
|
||||||
case 0: //Later Today
|
case 0: //Later Today
|
||||||
|
Loading…
Reference in New Issue
Block a user