Skip to content
Snippets Groups Projects
Commit 7b7451b3 authored by Albert  Babí Oller's avatar Albert Babí Oller Committed by Andreas Traczyk
Browse files

misc: Qt 5.14 migration

- QML headers revision
- networkmanager: use of deprecated QNetworkReply::error instead of errorOcurred

Gitlab: #127

Change-Id: I74f4fd01a0bf34f7a2cb4ae21e3ce611839846f5
parent 66b9dd82
No related branches found
No related tags found
No related merge requests found
Showing
with 84 additions and 90 deletions
...@@ -16,11 +16,10 @@ ...@@ -16,11 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
import QtQuick 2.15 import QtQuick 2.14
import QtQuick.Window 2.14
import QtQuick.Controls 2.14 import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.12 import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14 import QtGraphicalEffects 1.14
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.Dialogs 1.3 import QtQuick.Dialogs 1.3
......
...@@ -16,16 +16,16 @@ ...@@ -16,16 +16,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
import QtQuick 2.15 import QtQuick 2.14
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.14
import QtQuick.Window 2.14 import QtQuick.Controls 2.14
import QtQuick.Controls 2.15 import QtQuick.Controls.Universal 2.14
import QtQuick.Controls.Universal 2.12
import QtGraphicalEffects 1.14 import QtGraphicalEffects 1.14
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
import net.jami.Models 1.0 import net.jami.Models 1.0
import net.jami.Adapters 1.0 import net.jami.Adapters 1.0
import Qt.labs.platform 1.1
import "../../commoncomponents" import "../../commoncomponents"
ColumnLayout { ColumnLayout {
......
...@@ -16,16 +16,16 @@ ...@@ -16,16 +16,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
import QtQuick 2.15 import QtQuick 2.14
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.14
import QtQuick.Window 2.14 import QtQuick.Controls 2.14
import QtQuick.Controls 2.15 import QtQuick.Controls.Universal 2.14
import QtQuick.Controls.Universal 2.12
import QtGraphicalEffects 1.14 import QtGraphicalEffects 1.14
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
import net.jami.Models 1.0 import net.jami.Models 1.0
import net.jami.Adapters 1.0 import net.jami.Adapters 1.0
import Qt.labs.platform 1.1
import "../../commoncomponents" import "../../commoncomponents"
import "../../constant" import "../../constant"
......
...@@ -16,16 +16,16 @@ ...@@ -16,16 +16,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
import QtQuick 2.15 import QtQuick 2.14
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.14
import QtQuick.Window 2.14 import QtQuick.Controls 2.14
import QtQuick.Controls 2.15 import QtQuick.Controls.Universal 2.14
import QtQuick.Controls.Universal 2.12
import QtGraphicalEffects 1.14 import QtGraphicalEffects 1.14
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
import net.jami.Models 1.0 import net.jami.Models 1.0
import net.jami.Adapters 1.0 import net.jami.Adapters 1.0
import Qt.labs.platform 1.1
import "../../commoncomponents" import "../../commoncomponents"
import "../../constant" import "../../constant"
...@@ -58,4 +58,4 @@ ColumnLayout { ...@@ -58,4 +58,4 @@ ColumnLayout {
onEditFinished: SettingsAdapter.lineEditVoiceMailDialCodeEditFinished(textField) onEditFinished: SettingsAdapter.lineEditVoiceMailDialCodeEditFinished(textField)
} }
} }
\ No newline at end of file
...@@ -16,17 +16,17 @@ ...@@ -16,17 +16,17 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
import QtQuick 2.15 import QtQuick 2.14
import QtQuick.Window 2.14 import QtQuick.Controls 2.14
import QtQuick.Controls 2.15 import QtQuick.Controls.Universal 2.14
import QtQuick.Controls.Universal 2.12 import QtQuick.Layouts 1.14
import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.14 import QtGraphicalEffects 1.14
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
import net.jami.Models 1.0 import net.jami.Models 1.0
import net.jami.Adapters 1.0 import net.jami.Adapters 1.0
import net.jami.Enums 1.0 import net.jami.Enums 1.0
import Qt.labs.platform 1.1
import "../../commoncomponents" import "../../commoncomponents"
ColumnLayout { ColumnLayout {
......
...@@ -16,11 +16,10 @@ ...@@ -16,11 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
import QtQuick 2.15 import QtQuick 2.14
import QtQuick.Window 2.14 import QtQuick.Controls 2.14
import QtQuick.Controls 2.15 import QtQuick.Controls.Universal 2.14
import QtQuick.Controls.Universal 2.12 import QtQuick.Layouts 1.14
import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.14 import QtGraphicalEffects 1.14
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import net.jami.Models 1.0 import net.jami.Models 1.0
......
...@@ -16,16 +16,16 @@ ...@@ -16,16 +16,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
import QtQuick 2.15 import QtQuick 2.14
import QtQuick.Window 2.14 import QtQuick.Controls 2.14
import QtQuick.Controls 2.15 import QtQuick.Controls.Universal 2.14
import QtQuick.Controls.Universal 2.12 import QtQuick.Layouts 1.14
import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.14 import QtGraphicalEffects 1.14
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
import net.jami.Models 1.0 import net.jami.Models 1.0
import net.jami.Adapters 1.0 import net.jami.Adapters 1.0
import Qt.labs.platform 1.1
import "../../commoncomponents" import "../../commoncomponents"
ColumnLayout { ColumnLayout {
......
...@@ -16,11 +16,10 @@ ...@@ -16,11 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
import QtQuick 2.15 import QtQuick 2.14
import QtQuick.Window 2.15 import QtQuick.Controls 2.14
import QtQuick.Controls 2.15 import QtQuick.Controls.Universal 2.14
import QtQuick.Controls.Universal 2.12 import QtQuick.Layouts 1.14
import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.14 import QtGraphicalEffects 1.14
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import net.jami.Models 1.0 import net.jami.Models 1.0
......
...@@ -16,11 +16,10 @@ ...@@ -16,11 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
import QtQuick 2.15 import QtQuick 2.14
import QtQuick.Window 2.14
import QtQuick.Controls 2.14 import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.12 import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14 import QtGraphicalEffects 1.14
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.Dialogs 1.3 import QtQuick.Dialogs 1.3
......
...@@ -16,11 +16,10 @@ ...@@ -16,11 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
import QtQuick 2.15 import QtQuick 2.14
import QtQuick.Window 2.15 import QtQuick.Controls 2.14
import QtQuick.Controls 2.15 import QtQuick.Controls.Universal 2.14
import QtQuick.Controls.Universal 2.12 import QtQuick.Layouts 1.14
import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.14 import QtGraphicalEffects 1.14
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import net.jami.Models 1.0 import net.jami.Models 1.0
......
...@@ -16,16 +16,16 @@ ...@@ -16,16 +16,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
import QtQuick 2.15 import QtQuick 2.14
import QtQuick.Window 2.14
import QtQuick.Controls 2.14 import QtQuick.Controls 2.14
import QtQuick.Controls.Universal 2.12 import QtQuick.Controls.Universal 2.14
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.14
import Qt.labs.platform 1.1 import Qt.labs.platform 1.1
import QtGraphicalEffects 1.14 import QtGraphicalEffects 1.14
import net.jami.Models 1.0 import net.jami.Models 1.0
import net.jami.Adapters 1.0 import net.jami.Adapters 1.0
import net.jami.Enums 1.0 import net.jami.Enums 1.0
import "../../commoncomponents" import "../../commoncomponents"
Rectangle { Rectangle {
......
...@@ -16,16 +16,16 @@ ...@@ -16,16 +16,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
import QtQuick 2.15 import QtQuick 2.14
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.14
import QtQuick.Window 2.14 import QtQuick.Controls 2.14
import QtQuick.Controls 2.15 import QtQuick.Controls.Universal 2.14
import QtQuick.Controls.Universal 2.12
import QtGraphicalEffects 1.14 import QtGraphicalEffects 1.14
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
import net.jami.Models 1.0 import net.jami.Models 1.0
import net.jami.Adapters 1.0 import net.jami.Adapters 1.0
import Qt.labs.platform 1.1
import "../../commoncomponents" import "../../commoncomponents"
ColumnLayout { ColumnLayout {
......
import QtQuick 2.9 import QtQuick 2.14
import QtQuick.Controls 2.2 import QtQuick.Controls 2.14
Item { Item {
property alias text: shortcutText.text property alias text: shortcutText.text
......
...@@ -16,11 +16,11 @@ ...@@ -16,11 +16,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
import QtQuick 2.9 import QtQuick 2.14
import QtQuick.Controls 2.2 import QtQuick.Controls 2.14
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.14
import net.jami.Models 1.0 import net.jami.Models 1.0
import "../../constant" import "../../constant"
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
import QtQuick 2.15 import QtQuick 2.14
import QtQuick.Controls 2.15 import QtQuick.Controls 2.14
import net.jami.Models 1.0 import net.jami.Models 1.0
import net.jami.Adapters 1.0 import net.jami.Adapters 1.0
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import QtQuick 2.15 import QtQuick 2.14
import QtQuick.Controls 2.14 import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14 import QtQuick.Layouts 1.14
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
......
...@@ -16,17 +16,17 @@ ...@@ -16,17 +16,17 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
import QtQuick 2.15 import QtQuick 2.14
import QtQuick.Window 2.14 import QtQuick.Controls 2.14
import QtQuick.Controls 2.15 import QtQuick.Controls.Universal 2.14
import QtQuick.Controls.Universal 2.12
import QtQuick.Dialogs 1.3 import QtQuick.Dialogs 1.3
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.14
import QtGraphicalEffects 1.14 import QtGraphicalEffects 1.14
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
import net.jami.Models 1.0 import net.jami.Models 1.0
import net.jami.Adapters 1.0 import net.jami.Adapters 1.0
import Qt.labs.platform 1.1
import "../../commoncomponents" import "../../commoncomponents"
ColumnLayout { ColumnLayout {
......
...@@ -16,11 +16,10 @@ ...@@ -16,11 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
import QtQuick 2.15 import QtQuick 2.14
import QtQuick.Window 2.15 import QtQuick.Controls 2.14
import QtQuick.Controls 2.15 import QtQuick.Controls.Universal 2.14
import QtQuick.Controls.Universal 2.12 import QtQuick.Layouts 1.14
import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.14 import QtGraphicalEffects 1.14
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import net.jami.Models 1.0 import net.jami.Models 1.0
......
...@@ -16,16 +16,16 @@ ...@@ -16,16 +16,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
import QtQuick 2.15 import QtQuick 2.14
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.14
import QtQuick.Window 2.14 import QtQuick.Controls 2.14
import QtQuick.Controls 2.15 import QtQuick.Controls.Universal 2.14
import QtQuick.Controls.Universal 2.12
import QtGraphicalEffects 1.14 import QtGraphicalEffects 1.14
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
import Qt.labs.platform 1.1
import net.jami.Models 1.0 import net.jami.Models 1.0
import net.jami.Adapters 1.0 import net.jami.Adapters 1.0
import Qt.labs.platform 1.1
import "../../commoncomponents" import "../../commoncomponents"
import "../../constant" import "../../constant"
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import QtQuick 2.15 import QtQuick 2.14
import QtQuick.Controls 2.14 import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14 import QtQuick.Layouts 1.14
import QtQuick.Controls.Styles 1.4 import QtQuick.Controls.Styles 1.4
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment