mirror of https://github.com/vitalif/openscad
#1203 Explicitly set icon to make sure windows systems correctly set up the icon
parent
2ab649c226
commit
21cce232bc
|
@ -77,6 +77,7 @@ deploy {
|
|||
DEFINES += OPENSCAD_DEPLOY
|
||||
macx: CONFIG += sparkle
|
||||
}
|
||||
snapshot: DEFINES += OPENSCAD_SNAPSHOT
|
||||
|
||||
macx {
|
||||
TARGET = OpenSCAD
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
<file>icons/information-icons-question.png</file>
|
||||
<file>icons/information-icons-warning.png</file>
|
||||
<file>icons/openscad.png</file>
|
||||
<file>icons/openscad-nightly.png</file>
|
||||
<file>icons/button.png</file>
|
||||
<file>icons/background-welcome-screen.svg</file>
|
||||
<file>icons/prefsFeatures.png</file>
|
||||
|
|
|
@ -654,6 +654,11 @@ int gui(vector<string> &inputFiles, const fs::path &original_path, int argc, cha
|
|||
#else
|
||||
QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
|
||||
#endif
|
||||
#ifdef OPENSCAD_SNAPSHOT
|
||||
app.setWindowIcon(QIcon(":/icons/openscad-nightly.png"));
|
||||
#else
|
||||
app.setWindowIcon(QIcon(":/icons/openscad.png"));
|
||||
#endif
|
||||
|
||||
// Other global settings
|
||||
qRegisterMetaType<shared_ptr<const Geometry> >();
|
||||
|
|
Loading…
Reference in New Issue