Merge
--HG-- branch : develop
This commit is contained in:
commit
50dbe9471f
|
@ -13550,7 +13550,7 @@
|
|||
y="2496.2417"
|
||||
x="82.303215"
|
||||
sodipodi:role="line"
|
||||
id="tspan7665-0">Foot</tspan></text>
|
||||
id="tspan7665-0">Hand</tspan></text>
|
||||
<text
|
||||
xml:space="preserve"
|
||||
style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Standard Symbols L;-inkscape-font-specification:Standard Symbols L"
|
||||
|
|
Before Width: | Height: | Size: 850 KiB After Width: | Height: | Size: 850 KiB |
|
@ -158,6 +158,8 @@ MainWindow::MainWindow(QWidget *parent)
|
|||
ui->toolBarStages->setIconSize(QSize(24, 24));
|
||||
ui->toolBarTools->setIconSize(QSize(24, 24));
|
||||
|
||||
setUnifiedTitleAndToolBarOnMac(true);
|
||||
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 2)
|
||||
// Mac OS Dock Menu
|
||||
QMenu *menu = new QMenu(this);
|
||||
|
|
Loading…
Reference in New Issue
Block a user