This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/lib/webkit/webpage.cpp b/src/lib/webkit/webpage.cpp | |
| index 5e67a44..4ad479d 100644 | |
| --- a/src/lib/webkit/webpage.cpp | |
| +++ b/src/lib/webkit/webpage.cpp | |
| @@ -93,7 +93,8 @@ WebPage::WebPage(QObject* parent) | |
| connect(this, SIGNAL(printRequested(QWebFrame*)), this, SLOT(printFrame(QWebFrame*))); | |
| connect(this, SIGNAL(downloadRequested(QNetworkRequest)), this, SLOT(downloadRequested(QNetworkRequest))); | |
| connect(this, SIGNAL(windowCloseRequested()), this, SLOT(windowCloseRequested())); | |
| - connect(this, SIGNAL(restoreFrameStateRequested(QWebFrame*)), this, SLOT(restoreFrameRequested(QWebFrame*))); | |
| + connect(this, SIGNAL(frameCreated(QWebFrame*)), this, SLOT(frameCreated(QWebFrame*))); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/app/emoticon-text-edit-action.cpp b/app/emoticon-text-edit-action.cpp | |
| index 439c594..42f2478 100644 | |
| --- a/app/emoticon-text-edit-action.cpp | |
| +++ b/app/emoticon-text-edit-action.cpp | |
| @@ -19,6 +19,7 @@ | |
| */ | |
| #include "emoticon-text-edit-action.h" | |
| #include "emoticon-text-edit-selector.h" | |
| +#include "chat-window.h" | |
| #include <KLocale> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/filters/emoticons/CMakeLists.txt b/filters/emoticons/CMakeLists.txt | |
| index f61ef6f..d0c7873 100644 | |
| --- a/filters/emoticons/CMakeLists.txt | |
| +++ b/filters/emoticons/CMakeLists.txt | |
| @@ -1,5 +1,6 @@ | |
| set (ktptextui_message_filter_emoticons_SRCS | |
| emoticon-filter.cpp | |
| + emoticons-manager.cpp | |
| ) | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/CMakeLists.txt b/CMakeLists.txt | |
| index 2e72b74..ec07744 100644 | |
| --- a/CMakeLists.txt | |
| +++ b/CMakeLists.txt | |
| @@ -1,6 +1,6 @@ | |
| project(bluedevil) | |
| -find_package(KDE4 REQUIRED) | |
| +cmake_minimum_required(VERSION 2.8.12) | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/CMakeLists.txt b/CMakeLists.txt | |
| index 5509d61..f494fe2 100644 | |
| --- a/CMakeLists.txt | |
| +++ b/CMakeLists.txt | |
| @@ -1,9 +1,14 @@ | |
| project(libbluedevil) | |
| -cmake_minimum_required(VERSION 2.6.4) | |
| +cmake_minimum_required(VERSION 2.8.11) | |
| set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/lib/webview/tabwidget.cpp b/src/lib/webview/tabwidget.cpp | |
| index 22fe26e..d6e922e 100644 | |
| --- a/src/lib/webview/tabwidget.cpp | |
| +++ b/src/lib/webview/tabwidget.cpp | |
| @@ -481,10 +481,14 @@ void TabWidget::closeTab(int index, bool force) | |
| // This would close last tab, so we close the window instead | |
| if (!force && count() == 1) { | |
| - // But only if we can | |
| + // If we are not closing window upon closing last tab, let's just load new-tab-url |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| commit 93730ece3f26a8c162ce3280f0632dacae1e8628 | |
| Author: nowrep <[email protected]> | |
| Date: Thu Feb 13 12:55:31 2014 +0100 | |
| [ComboTabBar] Emit overflowChanged signal only once and only when it really changes | |
| diff --git a/src/lib/tools/combotabbar.cpp b/src/lib/tools/combotabbar.cpp | |
| index 3992c45..ea6f810 100644 | |
| --- a/src/lib/tools/combotabbar.cpp | |
| +++ b/src/lib/tools/combotabbar.cpp |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/defines.pri b/src/defines.pri | |
| index 4755adf..b83ce42 100644 | |
| --- a/src/defines.pri | |
| +++ b/src/defines.pri | |
| @@ -7,6 +7,9 @@ UI_DIR = $$PWD/../build | |
| # workaround for #849: see https://bugreports.qt-project.org/browse/QTBUG-23196 | |
| mocinclude.CONFIG *= fix_target | |
| +# workaround for https://bugreports.qt-project.org/browse/QTBUG-34950 | |
| +CONFIG -= gdb_dwarf_index |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| typedef QPair<QString, QString> QueryItem; | |
| QUrl mailto("mailto:[email protected][email protected]&[email protected]&subject=Isn't this really cool?&body=These mailto links are really cool! Right? Yeah, they are really great... :D"); | |
| QUrl gmail("https://mail.google.com/mail/?view=cm&fs=1&tf=1&source=mailto"); | |
| gmail.addQueryItem("to", mailto.toEncoded(QUrl::RemoveQuery | QUrl::RemoveScheme)); | |
| foreach (QueryItem item, mailto.queryItems()) { | |
| if (item.first == "subject") { | |
| gmail.addQueryItem("su", item.second); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| <?php | |
| class MoneyPoloRates | |
| { | |
| public $EUR; | |
| public $GBP; | |
| public $USD; | |
| private $reply; | |
| private $error = true; | |
| private $errorMessage; |