anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Be compatible with Qt 4.2 and 4.3 (Q_EMIT).

Browse Source 
Actually, it still fails to link with anything less than Qt 4.4.0
due to the xxxAndDestroy() business in GuiView.cpp ...


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36009 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2010-11-03 00:38:35 +00:00
parent bda8ae6a8c
commit 31b5ba7e25
2 changed files with 48 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/qt4/InGuiThread.h
View File

@ -19,6 +19,10 @@
#include "support/bind.h"
#include "support/functional.h"
#if QT_VERSION < 0x040400
#define Q_EMIT
#endif
namespace lyx {
namespace frontend {

58
src/frontends/qt4/ui/PrefScreenFontsUi.ui
View File

@ -5,7 +5,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>359</width>
<width>470</width>
<height>454</height>
</rect>
</property>
@ -13,10 +13,28 @@
<string/>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<layout class="QGridLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="1" column="1" >
<widget class="QComboBox" name="screenSansCO" >
<property name="maxVisibleItems" >
@ -30,7 +48,9 @@
<item row="1" column="2" >
<widget class="GuiFontExample" native="1" name="screenSansFE" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -56,7 +76,9 @@
<item row="0" column="2" >
<widget class="GuiFontExample" native="1" name="screenRomanFE" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -102,7 +124,9 @@
<item row="2" column="2" >
<widget class="GuiFontExample" native="1" name="screenTypewriterFE" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -125,8 +149,20 @@
</item>
<item row="1" column="0" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<layout class="QGridLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="QLabel" name="screenZoomLA" >
<property name="text" >
@ -170,17 +206,11 @@
<string>Font Sizes</string>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>11</number>
<property name="margin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>11</number>
</property>
<property name="rightMargin" >
<number>11</number>
</property>
<property name="bottomMargin" >
<number>11</number>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="1" >
<widget class="QLineEdit" name="screenTinyED" />