summaryrefslogtreecommitdiffstats
path: root/tools/installer
diff options
context:
space:
mode:
Diffstat (limited to 'tools/installer')
-rw-r--r--tools/installer/nsis/includes/qtcommon.nsh24
-rw-r--r--tools/installer/nsis/modules/mingw.nsh3
-rw-r--r--tools/installer/nsis/opensource.ini8
3 files changed, 5 insertions, 30 deletions
diff --git a/tools/installer/nsis/includes/qtcommon.nsh b/tools/installer/nsis/includes/qtcommon.nsh
index 66daced..986ca64 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 36e8e3b..3e40fe2 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
diff --git a/tools/installer/nsis/opensource.ini b/tools/installer/nsis/opensource.ini
index 23f2545..53f47af 100644
--- a/tools/installer/nsis/opensource.ini
+++ b/tools/installer/nsis/opensource.ini
@@ -55,8 +55,8 @@ Bottom=78
[Field 2]
Type=Link
-Text=http://qt.nokia.com/developer/downloads/qt
-State=http://qt.nokia.com/developer/downloads/qt
+Text=http://qt.nokia.com/downloads
+State=http://qt.nokia.com/downloads
Left=0
Right=278
Top=80
@@ -64,8 +64,8 @@ Bottom=88
[Field 3]
Type=Link
-Text=http://qt.nokia.com/company/model
-State=http://qt.nokia.com/company/model
+Text=http://qt.nokia.com/about
+State=http://qt.nokia.com/about
Left=0
Right=267
Top=112