diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-24 20:20:56 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-24 20:20:56 (GMT) |
| commit | e4002434bfde5c8206463ea3a0d4140835619944 (patch) | |
| tree | f199a1e233867ab4e85d22aa138391585af75fca /qmake | |
| parent | 3f183debfd677b952b015f6950131dd25bd4768b (diff) | |
| parent | 5a7c14af3c27089b0b8698da3c689637ffaa9cfa (diff) | |
| download | Qt-e4002434bfde5c8206463ea3a0d4140835619944.zip Qt-e4002434bfde5c8206463ea3a0d4140835619944.tar.gz Qt-e4002434bfde5c8206463ea3a0d4140835619944.tar.bz2 | |
Merge branch '4.6'
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/main.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
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(":/"))) |