Merge branch 'rebase_to_current_master' into 'master'

Rebase to current master See merge request mer-core/messagingframework!17
sailfishos · Sep 14, 2018 · 97cb7f1 · 97cb7f1
2 parents 16e178b + b194232
commit 97cb7f1
Show file tree

Hide file tree

Showing 741 changed files with 13,242 additions and 292,817 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "upstream"]
 	path = upstream
-	url = https://code.qt.io/git/qt-labs/messagingframework.git
+	url = https://code.qt.io/qt-labs/messagingframework.git
diff --git a/qmf/.gitignore b/qmf/.gitignore
diff --git a/qmf/CHANGES b/qmf/CHANGES
diff --git a/qmf/LGPL_EXCEPTION.txt b/qmf/LGPL_EXCEPTION.txt
diff --git a/qmf/LICENSE.FDL b/qmf/LICENSE.FDL
diff --git a/qmf/LICENSE.LGPL b/qmf/LICENSE.LGPL
diff --git a/qmf/LICENSE.PREVIEW.COMMERCIAL b/qmf/LICENSE.PREVIEW.COMMERCIAL
diff --git a/qmf/README b/qmf/README
diff --git a/qmf/benchmarks/benchmarks.pro b/qmf/benchmarks/benchmarks.pro
diff --git a/qmf/benchmarks/tst_messageserver/3rdparty/callgrind_p.h b/qmf/benchmarks/tst_messageserver/3rdparty/callgrind_p.h