summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Nienhüser <[email protected]>2017-04-23 10:59:02 +0200
committerDennis Nienhüser <[email protected]>2017-04-23 11:05:49 +0200
commit71a403067c213a12f3324f10c87ba9c2de018fc8 (patch)
treed09f63090b12060280e12f2da0175f4b96536a70
parent231a328868ceb0156ca136daf38a36aab316b5de (diff)
Use windeployqt instead of manual Qt dependency hunting
Usage: $ cd /path/to/export/dir $ windeployqt.exe --no-translations --release \ marble-qt.exe plugins/ lib/plugins/designer/ (cherry picked from commit acff87ac0614c8a1f903ea44312defef5093860d)
-rw-r--r--install/windows/marble-32bit.iss4
-rw-r--r--install/windows/marble-64bit.iss4
-rw-r--r--install/windows/marble-common.iss33
3 files changed, 0 insertions, 41 deletions
diff --git a/install/windows/marble-32bit.iss b/install/windows/marble-32bit.iss
index 47ffcfe..11e4fe9 100644
--- a/install/windows/marble-32bit.iss
+++ b/install/windows/marble-32bit.iss
@@ -1,7 +1,3 @@
-; Change this to your Qt installation directory. Make sure to choose
-; the correct compiler and architecture
-#define MyQtDir "C:\Qt\5.5\msvc2013"
-
; Change this to where you installed Marble to (CMAKE_INSTALL_PREFIX)
#define MyBuildDir "C:\marble\export-32bit"
diff --git a/install/windows/marble-64bit.iss b/install/windows/marble-64bit.iss
index 38a2ca8..62acf5b 100644
--- a/install/windows/marble-64bit.iss
+++ b/install/windows/marble-64bit.iss
@@ -1,7 +1,3 @@
-; Change this to your Qt installation directory. Make sure to choose
-; the correct compiler and architecture
-#define MyQtDir "C:\Qt\5.5\msvc2013_64"
-
; Change this to where you installed Marble to (CMAKE_INSTALL_PREFIX)
#define MyBuildDir "C:\marble\export-64bit"
diff --git a/install/windows/marble-common.iss b/install/windows/marble-common.iss
index 874a6f2..72fcc6c 100644
--- a/install/windows/marble-common.iss
+++ b/install/windows/marble-common.iss
@@ -35,39 +35,6 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
[Files]
Source: "{#MySrcDir}\marble.kde.org.url"; DestDir: "{app}"
Source: "{#MyBuildDir}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "{#MyQtDir}\bin\icudt54.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyQtDir}\bin\icuin54.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyQtDir}\bin\icuuc54.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyQtDir}\bin\Qt5Core.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyQtDir}\bin\Qt5Gui.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyQtDir}\bin\Qt5DBus.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyQtDir}\bin\Qt5Multimedia.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyQtDir}\bin\Qt5MultimediaWidgets.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyQtDir}\bin\Qt5Network.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyQtDir}\bin\Qt5OpenGL.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyQtDir}\bin\Qt5Positioning.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyQtDir}\bin\Qt5PrintSupport.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyQtDir}\bin\Qt5Qml.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyQtDir}\bin\Qt5Quick.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyQtDir}\bin\Qt5Script.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyQtDir}\bin\Qt5Sensors.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyQtDir}\bin\Qt5Sql.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyQtDir}\bin\Qt5Svg.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyQtDir}\bin\Qt5WebChannel.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyQtDir}\bin\Qt5WebKit.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyQtDir}\bin\Qt5WebKitWidgets.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyQtDir}\bin\Qt5Widgets.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyQtDir}\bin\Qt5Xml.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyQtDir}\plugins\platforms\qminimal.dll"; DestDir: "{app}\platforms"; Flags: ignoreversion
-Source: "{#MyQtDir}\plugins\platforms\qwindows.dll"; DestDir: "{app}\platforms"; Flags: ignoreversion
-Source: "{#MyQtDir}\plugins\imageformats\qjpeg.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
-Source: "{#MyQtDir}\plugins\imageformats\qsvg.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
-Source: "{#MyQtDir}\plugins\imageformats\qtiff.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
-Source: "{#MyQtDir}\plugins\imageformats\qgif.dll"; DestDir: "{app}\imageformats"; Flags: ignoreversion
-Source: "{#MyQtDir}\plugins\bearer\qgenericbearer.dll"; DestDir: "{app}\bearer"; Flags: ignoreversion
-Source: "{#MyQtDir}\plugins\bearer\qnativewifibearer.dll"; DestDir: "{app}\bearer"; Flags: ignoreversion
-Source: "{#MyQtDir}\plugins\printsupport\windowsprintersupport.dll"; DestDir: "{app}\printsupport"; Flags: ignoreversion
-Source: "{#MyQtDir}\plugins\sqldrivers\qsqlite.dll"; DestDir: "{app}\sqldrivers"; Flags: ignoreversion
; NOTE: Don't use "Flags: ignoreversion" on any shared system files