Allow using static Qt libraries
This commit is contained in:
parent
77284da073
commit
a789fa24b3
|
@ -112,7 +112,6 @@ set(REQUIRED_ICONS
|
||||||
edit-redo
|
edit-redo
|
||||||
system-run
|
system-run
|
||||||
go-next
|
go-next
|
||||||
qtcreator
|
|
||||||
document-export
|
document-export
|
||||||
password-generate
|
password-generate
|
||||||
)
|
)
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
|
|
||||||
#include <qtutilities/resources/qtconfigarguments.h>
|
#include <qtutilities/resources/qtconfigarguments.h>
|
||||||
#include <qtutilities/resources/resources.h>
|
#include <qtutilities/resources/resources.h>
|
||||||
|
#include <qtutilities/resources/importplugin.h>
|
||||||
#include <qtutilities/settingsdialog/qtsettings.h>
|
#include <qtutilities/settingsdialog/qtsettings.h>
|
||||||
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
|
|
|
@ -402,7 +402,8 @@
|
||||||
</action>
|
</action>
|
||||||
<action name="actionPasswordGenerator">
|
<action name="actionPasswordGenerator">
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset theme="password-generate"/>
|
<iconset theme="password-generate">
|
||||||
|
<normaloff>.</normaloff>.</iconset>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>&Password generator</string>
|
<string>&Password generator</string>
|
||||||
|
@ -507,10 +508,11 @@
|
||||||
</action>
|
</action>
|
||||||
<action name="actionQtSettings">
|
<action name="actionQtSettings">
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset theme="qtcreator"/>
|
<iconset theme="qtcreator" resource="../../qtutilities/resources/qtutilsicons.qrc">
|
||||||
|
<normaloff>:/qtutilities/icons/hicolor/48x48/apps/qtcreator.svg</normaloff>:/qtutilities/icons/hicolor/48x48/apps/qtcreator.svg</iconset>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Qt settings</string>
|
<string>&Qt settings</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
</widget>
|
</widget>
|
||||||
|
@ -523,6 +525,7 @@
|
||||||
</customwidget>
|
</customwidget>
|
||||||
</customwidgets>
|
</customwidgets>
|
||||||
<resources>
|
<resources>
|
||||||
|
<include location="../../qtutilities/resources/qtutilsicons.qrc"/>
|
||||||
<include location="../resources/icons.qrc"/>
|
<include location="../resources/icons.qrc"/>
|
||||||
</resources>
|
</resources>
|
||||||
<connections/>
|
<connections/>
|
||||||
|
|
Loading…
Reference in New Issue