diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-24 16:35:59 +1000 |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-24 16:35:59 +1000 |
| commit | 4abc6e00d1a2eca205640b61f20d4af95ec2a9ab (patch) | |
| tree | 3f4605b7fae733ea90dbbd86532c0e836cf9249e /tools | |
| parent | 6af5f111e0f9463c3a907e187b1276c947ed43e2 (diff) | |
Remove last vestiges of the qtusagereporter.
Reviewed-by: Trust Me
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/designer/src/designer/main.cpp | 14 | ||||
| -rw-r--r-- | tools/installer/nsis/includes/qtcommon.nsh | 24 | ||||
| -rw-r--r-- | tools/installer/nsis/modules/mingw.nsh | 3 |
3 files changed, 1 insertions, 40 deletions
diff --git a/tools/designer/src/designer/main.cpp b/tools/designer/src/designer/main.cpp index f76a68aad3..87f25362d3 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 df1ebdf87b..9c0756a06e 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 386d7d7f81..d294cb8b37 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 |