Remove last vestiges of the qtusagereporter.

Reviewed-by: Trust Me

7 files changed, 1 insertions, 85 deletions

diff --git a/projects.pro b/projects.pro
index a1f2dd1..2a6a956 100644
--- a/projects.pro
+++ b/projects.pro
@@ -157,8 +157,3 @@ false:macx { #mac install location
     INSTALLS += macdocs
 }
 
-!win32:contains(QT_CONFIG, qtusagereporter) {
-    usagereporter.path=$$[QT_INSTALL_BINS]
-    usagereporter.files=$$QT_BUILD_TREE/bin/qtusagereporter
-    INSTALLS += usagereporter
-}
diff --git a/qmake/main.cpp b/qmake/main.cpp
index 3fb79dd..92a00c8 100644
--- a/qmake/main.cpp
+++ b/qmake/main.cpp
@@ -98,17 +98,6 @@ int runQMake(int argc, char **argv)
         return 0;
     }
 
-    // report Qt usage for commercial customers with a "metered license" (currently experimental)
-#if QT_EDITION != QT_EDITION_OPENSOURCE
-    QString reporterPath = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator()
-                           + "qtusagereporter";
-#if defined(Q_OS_WIN)
-    reporterPath += ".exe";
-#endif
-    if (QFile::exists(reporterPath))
-        system(qPrintable(reporterPath + " qmake"));
-#endif
-
     QString oldpwd = qmake_getpwd();
 #ifdef Q_WS_WIN
     if(!(oldpwd.length() == 3 && oldpwd[0].isLetter() && oldpwd.endsWith(":/")))
diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp
index 4c99eaa..a1f44ca 100644
--- a/src/tools/moc/main.cpp
+++ b/src/tools/moc/main.cpp
@@ -216,20 +216,6 @@ int runMoc(int _argc, char **_argv)
         }
     }
 
-    // report Qt usage for commercial customers with a "metered license" (currently experimental)
-#if QT_EDITION != QT_EDITION_OPENSOURCE
-#ifdef QT_CONFIGURE_BINARIES_PATH
-    const char *binariesPath = QT_CONFIGURE_BINARIES_PATH;
-    QString reporterPath = QString::fromLocal8Bit(binariesPath) + QDir::separator()
-                           + QLatin1String("qtusagereporter");
-#if defined(Q_OS_WIN)
-    reporterPath += QLatin1String(".exe");
-#endif
-    if (QFile::exists(reporterPath))
-        system(qPrintable(reporterPath + QLatin1String(" moc")));
-#endif
-#endif
-
     argc = argv.count();
 
     for (int n = 0; n < argc; ++n) {
diff --git a/src/tools/uic/main.cpp b/src/tools/uic/main.cpp
index 9d97085..363f8af 100644
--- a/src/tools/uic/main.cpp
+++ b/src/tools/uic/main.cpp
@@ -138,21 +138,6 @@ int runUic(int argc, char *argv[])
         ++arg;
     }
 
-    // report Qt usage for commercial customers with a "metered license" (currently experimental)
-#if QT_EDITION != QT_EDITION_OPENSOURCE
-#ifdef QT_CONFIGURE_BINARIES_PATH
-    const char *binariesPath = QT_CONFIGURE_BINARIES_PATH;
-    QString reporterPath = QString::fromLocal8Bit(binariesPath);
-    reporterPath += QDir::separator();
-    reporterPath += QLatin1String("qtusagereporter");
-#if defined(Q_OS_WIN)
-    reporterPath += QLatin1String(".exe");
-#endif
-    if (QFile::exists(reporterPath))
-        system(qPrintable(reporterPath + QLatin1String(" uic")));
-#endif
-#endif
-
     QString inputFile;
     if (fileName)
         inputFile = QString::fromLocal8Bit(fileName);
diff --git a/tools/designer/src/designer/main.cpp b/tools/designer/src/designer/main.cpp
index f76a68a..87f2536 100644
--- a/tools/designer/src/designer/main.cpp
+++ b/tools/designer/src/designer/main.cpp
@@ -51,20 +51,6 @@ int main(int argc, char *argv[])
 {
     Q_INIT_RESOURCE(designer);
 
-    // report Qt usage for commercial customers with a "metered license" (currently experimental)
-#if QT_EDITION != QT_EDITION_OPENSOURCE
-    QString reporterPath = QLibraryInfo::location(QLibraryInfo::BinariesPath);
-    reporterPath += QDir::separator();
-    reporterPath += QLatin1String("qtusagereporter");
-#if defined(Q_OS_WIN)
-    reporterPath += QLatin1String(".exe");
-#endif
-#ifndef Q_OS_WINCE
-    if (QFile::exists(reporterPath))
-        ::system(qPrintable(reporterPath + QLatin1String(" designer")));
-#endif
-#endif
-
     QDesigner app(argc, argv);
     app.setQuitOnLastWindowClosed(false);
 
diff --git a/tools/installer/nsis/includes/qtcommon.nsh b/tools/installer/nsis/includes/qtcommon.nsh
index df1ebdf..9c0756a 100644
--- a/tools/installer/nsis/includes/qtcommon.nsh
+++ b/tools/installer/nsis/includes/qtcommon.nsh
@@ -72,28 +72,6 @@ FunctionEnd
 !insertmacro MakeQtDirectory ""
 !insertmacro MakeQtDirectory "un."
 
-Function DeleteFloatingLicenseProgram
-  exch $1
-  push $0
-  
-  StrCmp $LICENSE_KEY "" end
-
-  ClearErrors
-  !ifndef OPENSOURCE_BUILD
-  qtnsisext::IsFloatingLicense $LICENSE_KEY
-  !endif
-  IfErrors end
-  pop $0
-  
-  StrCmp $0 "1" end
-    IfFileExists "$1\bin\qtusagereporter.exe" 0 end
-      Delete "$1\bin\qtusagereporter.exe"
-
-  end:
-  pop $0
-  pop $1
-FunctionEnd
-
 Function AddStartmenuApplication
   exch $0
   IfFileExists "$0\assistant.exe" 0 +2
@@ -571,4 +549,4 @@ directoryOk:
 done:
 FunctionEnd
 
-!endif ;QTCOMMON_INCLUDE
\ No newline at end of file
+!endif ;QTCOMMON_INCLUDE
diff --git a/tools/installer/nsis/modules/mingw.nsh b/tools/installer/nsis/modules/mingw.nsh
index 386d7d7..d294cb8 100644
--- a/tools/installer/nsis/modules/mingw.nsh
+++ b/tools/installer/nsis/modules/mingw.nsh
@@ -107,9 +107,6 @@ Section "${MODULE_MINGW_NAME} ${MODULE_MINGW_VERSION}" MINGW_SEC01
   SetOverwrite ifnewer
   !insertmacro MODULE_MINGW_INSTALLFILES
   
-  push "$MINGW_INSTDIR"
-  call DeleteFloatingLicenseProgram
-
   push "$MINGW_INSTDIR\bin"
   call AddStartmenuApplication