diff --git a/README b/README index d0295dd88..d90e04e84 100644 --- a/README +++ b/README @@ -3,7 +3,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 -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) diff --git a/src/3rdparty/qtlocalpeer.cpp b/src/3rdparty/qtlocalpeer.cpp index f531956f3..80a6e2b8c 100644 --- a/src/3rdparty/qtlocalpeer.cpp +++ b/src/3rdparty/qtlocalpeer.cpp @@ -191,7 +191,7 @@ void QtLocalPeer::receiveConnection() uMsgBuf += got; } while (remaining && got >= 0 && socket->waitForReadyRead(2000)); if (got < 0) { - qWarning() << "QtLocalPeer: Message reception failed" << socket->errorString(); + qWarning(QString("QtLocalPeer: Message reception failed "+socket->errorString()).toLocal8Bit()); delete socket; return; } diff --git a/src/QupZilla.pro b/src/QupZilla.pro index c66570206..48a217706 100644 --- a/src/QupZilla.pro +++ b/src/QupZilla.pro @@ -17,7 +17,9 @@ MOC_DIR = ../build RCC_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\ app\ diff --git a/src/app/qupzilla.h b/src/app/qupzilla.h index 186980482..5c009c12f 100644 --- a/src/app/qupzilla.h +++ b/src/app/qupzilla.h @@ -19,7 +19,7 @@ #define QUPZILLA_H //Comment for release building -#define DEVELOPING +//#define DEVELOPING //Check if i don't fuck anything #ifdef QT_NO_DEBUG diff --git a/src/downloads/downloaditem.ui b/src/downloads/downloaditem.ui index d803c8766..04c81c752 100644 --- a/src/downloads/downloaditem.ui +++ b/src/downloads/downloaditem.ui @@ -67,9 +67,6 @@ - - - 0 @@ -97,16 +94,16 @@ - - SqueezeLabel - QLabel -
squeezelabel.h
-
ClickableLabel QLabel
clickablelabel.h
+ + SqueezeLabel + QLabel +
squeezelabel.h
+
diff --git a/src/other/clearprivatedata.cpp b/src/other/clearprivatedata.cpp index 5acd240c8..cd387030f 100644 --- a/src/other/clearprivatedata.cpp +++ b/src/other/clearprivatedata.cpp @@ -50,7 +50,7 @@ void ClearPrivateData::dialogAccepted() if (ui->history->isChecked()) { QDateTime dateTime = QDateTime::currentDateTime(); qint64 nowMS = QDateTime::currentMSecsSinceEpoch(); - qint64 date; + qint64 date = 0; switch (ui->historyLength->currentIndex()) { case 0: //Later Today