Merge remote-tracking branch 'origin/4.10'

Change-Id: I5a868d98ae6b89f409e1bc8c06c5423afa084323

7 files changed, 169 insertions, 19 deletions

diff --git a/UsageStatistic.json.in b/UsageStatistic.json.in
index 9e7bde3..0ed40e6 100644
--- a/UsageStatistic.json.in
+++ b/UsageStatistic.json.in
@@ -1,9 +1,9 @@
 {
     \"Name\" : \"UsageStatistic\",
-    \"Version\" : \"1.0.0\",
-    \"CompatVersion\" : \"1.0.0\",
+    \"Version\" : \"$$QTCREATOR_VERSION\",
+    \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\",
     \"Vendor\" : \"The Qt Company Ltd\",
-    \"Copyright\" : \"(C) The Qt Company Ltd\",
+    \"Copyright\" : \"(C) $$QTCREATOR_COPYRIGHT_YEAR The Qt Company Ltd\",
     \"License\" : \"GNU GPL v3\",
     \"Description\" : \"This plugin is used to collect usage statistic. All statistics are anonymous. You can switch off the plugin any time you want.\",
     \"Url\" : \"https://www.qt.io/\",
diff --git a/images/settingscategory_usagestatistic.png b/images/settingscategory_usagestatistic.png
new file mode 100644
index 0000000..e45c00b
--- /dev/null
+++ b/images/settingscategory_usagestatistic.png
diff --git a/images/settingscategory_usagestatistic.svg b/images/settingscategory_usagestatistic.svg
new file mode 100644
index 0000000..c4bd019
--- /dev/null
+++ b/images/settingscategory_usagestatistic.svg
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   viewBox="0 0 6.35 6.35"
+   version="1.1"
+   id="svg2581"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="settingscategory_usagestatistic.svg">
+  <defs
+     id="defs2575" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3287"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2"
+       dotted="true" />
+    <sodipodi:guide
+       position="0,5.2916667"
+       orientation="0,1"
+       id="guide6992"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="1.0583333,0"
+       orientation="1,0"
+       id="guide6994"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="0,1.0583333"
+       orientation="0,1"
+       id="guide6996"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="5.2916667,0"
+       orientation="1,0"
+       id="guide6998"
+       inkscape:locked="false"
+       inkscape:label=""
+       inkscape:color="rgb(0,0,255)" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2578">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-290.64998)">
+    <g
+       transform="matrix(0.26458333,0,0,0.26458333,-310.09162,137.19165)"
+       id="settingscategory_usagestatistic"
+       style="display:inline">
+      <rect
+         y="580"
+         x="1172"
+         height="24"
+         width="24"
+         id="use2493"
+         style="display:inline;fill:#ffffff;stroke-width:1.5" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path2521"
+         d="m 1176,589.5 h 16"
+         style="fill:none;stroke:#000000" />
+      <path
+         sodipodi:nodetypes="csssc"
+         inkscape:connector-curvature="0"
+         id="path2523"
+         d="m 1180,589.5 c 0,-1 1,-5 1.5,-5 0.5,0 1,1.5 2.5,1.5 1.5,0 2,-1.5 2.5,-1.5 0.5,0 1.5,4 1.5,5"
+         style="fill:#000000;stroke:#000000" />
+      <circle
+         r="5"
+         cy="592.5"
+         cx="1182.5"
+         id="path2525"
+         style="fill:#ffffff;stroke:#000000" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path2527"
+         d="M 1189.24,599.24 1186,596"
+         style="fill:none;stroke:#000000;stroke-width:2" />
+      <path
+         sodipodi:nodetypes="cccccc"
+         inkscape:connector-curvature="0"
+         d="m 1184.5,595 v -5 m -2,5 v -3 m -2,1 v 2"
+         style="fill:none;stroke:#000000"
+         id="path2535" />
+    </g>
+  </g>
+</svg>
diff --git a/images/settingscategory_usagestatistic@2x.png b/images/settingscategory_usagestatistic@2x.png
new file mode 100644
index 0000000..136c67e
--- /dev/null
+++ b/images/settingscategory_usagestatistic@2x.png
diff --git a/ui/usagestatisticpage.cpp b/ui/usagestatisticpage.cpp
index 50fe5c1..10de382 100644
--- a/ui/usagestatisticpage.cpp
+++ b/ui/usagestatisticpage.cpp
@@ -81,6 +81,8 @@ void UsageStatisticPage::configure()
 {
     setId(Constants::USAGE_STATISTIC_PAGE_ID);
     setCategory(Constants::TELEMETRY_SETTINGS_CATEGORY_ID);
+    setCategoryIcon(Utils::Icon({{":/usagestatistic/images/settingscategory_usagestatistic.png",
+                    Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint));
 
     setDisplayName(tr("Usage Statistic"));
     setDisplayCategory(tr("Telemetry"));
diff --git a/usagestatistic.pro b/usagestatistic.pro
index 0c22626..e0acd5e 100644
--- a/usagestatistic.pro
+++ b/usagestatistic.pro
@@ -5,7 +5,8 @@ KUSERFEEDBACK_INSTALL_PATH = "$${OUT_PWD}/kuserfeedback"
 INCLUDEPATH *= "$$shell_path($${KUSERFEEDBACK_INSTALL_PATH}/include)" "$${PWD}"
 
 CONFIG += c++1z
-QMAKE_CXXFLAGS *= -Wall -Wextra -pedantic
+QMAKE_CXXFLAGS *= -Wall
+!msvc:QMAKE_CXXFLAGS *= -Wextra -pedantic
 
 DEFINES += $$shell_quote(USP_AUTH_KEY=\"$$(USP_AUTH_KEY)\")
 DEFINES += $$shell_quote(USP_SERVER_URL=\"$$(USP_SERVER_URL)\")
@@ -48,6 +49,9 @@ HEADERS += \
     services/datasubmitter.h \
     common/utils.h
 
+RESOURCES += \
+    usagestatistic.qrc
+
 # Qt Creator linking
 
 ## Either set the IDE_SOURCE_TREE when running qmake,
@@ -85,7 +89,7 @@ QTC_PLUGIN_RECOMMENDS += \
 
 ###### End _dependencies.pri contents ######
 
-!build_pass {
+!build_pass|win32 {
     EXTRA_CMAKE_MODULES_BUILD_PATH   = "$${OUT_PWD}/extra-cmake-modules/build"
     EXTRA_CMAKE_MODULES_SOURCE_PATH  = "$${PWD}/3rdparty/extra-cmake-modules"
     EXTRA_CMAKE_MODULES_INSTALL_PATH = "$${OUT_PWD}/extra-cmake-modules"
@@ -108,18 +112,26 @@ QTC_PLUGIN_RECOMMENDS += \
     BUILD_TYPE = Debug
     CONFIG(release, debug|release): BUILD_TYPE = Release
 
+    KUSERFEEDBACK_DEFINES = \
+        -DCMAKE_BUILD_TYPE=$${BUILD_TYPE}
+
+    macos: KUSERFEEDBACK_DEFINES *= -DCMAKE_OSX_DEPLOYMENT_TARGET=$${QMAKE_MACOSX_DEPLOYMENT_TARGET}
+
+    KUSERFEEDBACK_COMPONENTS = \
+        -DBUILD_SHARED_LIBS=OFF \
+        -DENABLE_SURVEY_TARGET_EXPRESSIONS=OFF \
+        -DENABLE_PHP=OFF \
+        -DENABLE_PHP_UNIT=OFF \
+        -DENABLE_TESTING=OFF \
+        -DENABLE_DOCS=OFF \
+        -DENABLE_CONSOLE=OFF \
+        -DENABLE_CLI=OFF \
+        -DBUILD_SHARED_LIBS=OFF
+
     system("cmake -S $$shell_path($${KUSERFEEDBACK_SOURCE_PATH}) \
                   -B $$shell_path($${KUSERFEEDBACK_BUILD_PATH}) \
-                  -DBUILD_SHARED_LIBS=OFF \
-                  -DENABLE_SURVEY_TARGET_EXPRESSIONS=OFF \
-                  -DENABLE_PHP=OFF \
-                  -DENABLE_PHP_UNIT=OFF \
-                  -DENABLE_TESTING=OFF \
-                  -DENABLE_DOCS=OFF \
-                  -DENABLE_CONSOLE=OFF \
-                  -DENABLE_CLI=OFF \
-                  -DBUILD_SHARED_LIBS=OFF \
-                  -DCMAKE_BUILD_TYPE=$${BUILD_TYPE} \
+                  $${KUSERFEEDBACK_COMPONENTS} \
+                  $${KUSERFEEDBACK_DEFINES} \
                   -DCMAKE_INSTALL_PREFIX:PATH=\"$$shell_path($${KUSERFEEDBACK_INSTALL_PATH})\" \
                   -DCMAKE_PREFIX_PATH=\"$${CMAKE_PREFIX_PATHS}\" \
                   -DKDE_INSTALL_LIBDIR=lib")
@@ -140,11 +152,11 @@ QTC_PLUGIN_RECOMMENDS += \
 
 include($$IDE_SOURCE_TREE/src/qtcreatorplugin.pri)
 
-# Put it here to use qtLibraryName function without extra hacks
+# Put it here to use qtLibraryTargetName function without extra hacks
 LIBS *= -L"$$shell_path($${KUSERFEEDBACK_INSTALL_PATH}/lib)" \
-            -l$$qtLibraryName(KUserFeedbackCore)             \
-            -l$$qtLibraryName(KUserFeedbackWidgets)          \
-            -l$$qtLibraryName(KUserFeedbackCommon)
+            -l$$qtLibraryTargetName(KUserFeedbackCore)       \
+            -l$$qtLibraryTargetName(KUserFeedbackWidgets)    \
+            -l$$qtLibraryTargetName(KUserFeedbackCommon)
 
 FORMS += \
     ui/usagestatisticwidget.ui \
diff --git a/usagestatistic.qrc b/usagestatistic.qrc
new file mode 100644
index 0000000..8ab02df
--- /dev/null
+++ b/usagestatistic.qrc
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/usagestatistic">
+        <file>images/settingscategory_usagestatistic.png</file>
+        <file>images/settingscategory_usagestatistic@2x.png</file>
+    </qresource>
+</RCC>