Abdelrazak Younes wrote:
Georg Baum wrote:
Abdelrazak Younes wrote:
Enrico Forestieri wrote:
I think this not a big deal, but LyX/Qt4 is not really Qt3Support free
;-)
On my system it really is... Grepping for Q3 and Qt3 gives absolutely
nothing:
Enrico is right, it is not. Grep the build dir, and you will see it. For
example, this patch removes a qt3 header from one generated .h file. I
guess you know what needs to be done for the others.
Yes, thanks for the hint. This line is regenerated when you save a ui
file within Qt Designer but without the qPixmapFromMimeSource. I removed
all of them and am compiling right now. Will commit as soon as I am sure
there is no side effect.
No side effect visible, the dialogs looks as usual. I guess this is
qPixmapFromMimeSource was a remnant of Qt3 or Qt2 ui format.
Will commit soon the attached patch.
Abdel.
Index: BiblioUi.ui
===================================================================
--- BiblioUi.ui (revision 14826)
+++ BiblioUi.ui (working copy)
@@ -133,7 +133,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<resources/>
<connections/>
</ui>
Index: BranchesUi.ui
===================================================================
--- BranchesUi.ui (revision 14826)
+++ BranchesUi.ui (working copy)
@@ -106,7 +106,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<resources/>
<connections/>
</ui>
Index: BulletsUi.ui
===================================================================
--- BulletsUi.ui (revision 14826)
+++ BulletsUi.ui (working copy)
@@ -186,7 +186,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<resources/>
<connections>
<connection>
Index: FontUi.ui
===================================================================
--- FontUi.ui (revision 14826)
+++ FontUi.ui (working copy)
@@ -250,7 +250,7 @@
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>fontsRomanCO</tabstop>
<tabstop>fontsizeCO</tabstop>
Index: LanguageUi.ui
===================================================================
--- LanguageUi.ui (revision 14826)
+++ LanguageUi.ui (working copy)
@@ -204,7 +204,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>languageCO</tabstop>
<tabstop>defaultencodingCB</tabstop>
Index: LaTeXUi.ui
===================================================================
--- LaTeXUi.ui (revision 14826)
+++ LaTeXUi.ui (working copy)
@@ -170,7 +170,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>classCO</tabstop>
<tabstop>optionsLE</tabstop>
Index: MathsUi.ui
===================================================================
--- MathsUi.ui (revision 14826)
+++ MathsUi.ui (working copy)
@@ -57,7 +57,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>amsautoCB</tabstop>
</tabstops>
Index: NumberingUi.ui
===================================================================
--- NumberingUi.ui (revision 14826)
+++ NumberingUi.ui (working copy)
@@ -79,7 +79,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>tocSL</tabstop>
<tabstop>depthSL</tabstop>
Index: PreambleUi.ui
===================================================================
--- PreambleUi.ui (revision 14826)
+++ PreambleUi.ui (working copy)
@@ -27,7 +27,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<resources/>
<connections/>
</ui>
Index: QAboutUi.ui
===================================================================
--- QAboutUi.ui (revision 14826)
+++ QAboutUi.ui (working copy)
@@ -139,7 +139,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<resources/>
<connections/>
</ui>
Index: QAskForTextUi.ui
===================================================================
--- QAskForTextUi.ui (revision 14826)
+++ QAskForTextUi.ui (working copy)
@@ -102,7 +102,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<resources/>
<connections/>
</ui>
Index: QBibitemUi.ui
===================================================================
--- QBibitemUi.ui (revision 14826)
+++ QBibitemUi.ui (working copy)
@@ -146,7 +146,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<resources/>
<connections/>
</ui>
Index: QBibtexAddUi.ui
===================================================================
--- QBibtexAddUi.ui (revision 14826)
+++ QBibtexAddUi.ui (working copy)
@@ -135,7 +135,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>bibED</tabstop>
<tabstop>addPB</tabstop>
Index: QBibtexUi.ui
===================================================================
--- QBibtexUi.ui (revision 14826)
+++ QBibtexUi.ui (working copy)
@@ -258,7 +258,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>addBibPB</tabstop>
<tabstop>deletePB</tabstop>
Index: QBranchUi.ui
===================================================================
--- QBranchUi.ui (revision 14826)
+++ QBranchUi.ui (working copy)
@@ -74,7 +74,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<resources/>
<connections/>
</ui>
Index: QChangesUi.ui
===================================================================
--- QChangesUi.ui (revision 14826)
+++ QChangesUi.ui (working copy)
@@ -135,7 +135,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>acceptPB</tabstop>
<tabstop>rejectPB</tabstop>
Index: QCharacterUi.ui
===================================================================
--- QCharacterUi.ui (revision 14826)
+++ QCharacterUi.ui (working copy)
@@ -383,7 +383,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>familyCO</tabstop>
<tabstop>seriesCO</tabstop>
Index: QErrorListUi.ui
===================================================================
--- QErrorListUi.ui (revision 14826)
+++ QErrorListUi.ui (working copy)
@@ -65,7 +65,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<resources/>
<connections/>
</ui>
Index: QERTUi.ui
===================================================================
--- QERTUi.ui (revision 14826)
+++ QERTUi.ui (working copy)
@@ -118,7 +118,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<resources/>
<connections/>
</ui>
Index: QIncludeUi.ui
===================================================================
--- QIncludeUi.ui (revision 14826)
+++ QIncludeUi.ui (working copy)
@@ -263,7 +263,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>filenameED</tabstop>
<tabstop>browsePB</tabstop>
Index: QIndexUi.ui
===================================================================
--- QIndexUi.ui (revision 14826)
+++ QIndexUi.ui (working copy)
@@ -100,7 +100,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<resources/>
<connections/>
</ui>
Index: QLogUi.ui
===================================================================
--- QLogUi.ui (revision 14826)
+++ QLogUi.ui (working copy)
@@ -76,7 +76,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>updatePB</tabstop>
<tabstop>closePB</tabstop>
Index: QNoteUi.ui
===================================================================
--- QNoteUi.ui (revision 14826)
+++ QNoteUi.ui (working copy)
@@ -112,7 +112,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<resources/>
<connections/>
</ui>
Index: QParagraphUi.ui
===================================================================
--- QParagraphUi.ui (revision 14826)
+++ QParagraphUi.ui (working copy)
@@ -289,7 +289,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>restorePB</tabstop>
<tabstop>okPB</tabstop>
Index: QPrefAsciiUi.ui
===================================================================
--- QPrefAsciiUi.ui (revision 14826)
+++ QPrefAsciiUi.ui (working copy)
@@ -113,7 +113,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<resources/>
<connections/>
</ui>
Index: QPrefColorsUi.ui
===================================================================
--- QPrefColorsUi.ui (revision 14826)
+++ QPrefColorsUi.ui (working copy)
@@ -86,7 +86,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<resources/>
<connections/>
</ui>
Index: QPrefConvertersUi.ui
===================================================================
--- QPrefConvertersUi.ui (revision 14826)
+++ QPrefConvertersUi.ui (working copy)
@@ -212,7 +212,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>converterFromCO</tabstop>
<tabstop>converterToCO</tabstop>
Index: QPrefCopiersUi.ui
===================================================================
--- QPrefCopiersUi.ui (revision 14826)
+++ QPrefCopiersUi.ui (working copy)
@@ -174,7 +174,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>copierFormatCO</tabstop>
<tabstop>copierED</tabstop>
Index: QPrefCygwinPathUi.ui
===================================================================
--- QPrefCygwinPathUi.ui (revision 14826)
+++ QPrefCygwinPathUi.ui (working copy)
@@ -38,7 +38,7 @@
</property>
</widget>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<resources/>
<connections/>
</ui>
Index: QPrefDateUi.ui
===================================================================
--- QPrefDateUi.ui (revision 14826)
+++ QPrefDateUi.ui (working copy)
@@ -67,7 +67,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<resources/>
<connections/>
</ui>
Index: QPrefDisplayUi.ui
===================================================================
--- QPrefDisplayUi.ui (revision 14826)
+++ QPrefDisplayUi.ui (working copy)
@@ -113,7 +113,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<resources/>
<connections/>
</ui>
Index: QPrefFileformatsUi.ui
===================================================================
--- QPrefFileformatsUi.ui (revision 14826)
+++ QPrefFileformatsUi.ui (working copy)
@@ -230,7 +230,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>formatNewPB</tabstop>
<tabstop>formatRemovePB</tabstop>
Index: QPrefIdentityUi.ui
===================================================================
--- QPrefIdentityUi.ui (revision 14826)
+++ QPrefIdentityUi.ui (working copy)
@@ -84,7 +84,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>nameED</tabstop>
<tabstop>emailED</tabstop>
Index: QPrefKeyboardUi.ui
===================================================================
--- QPrefKeyboardUi.ui (revision 14826)
+++ QPrefKeyboardUi.ui (working copy)
@@ -93,7 +93,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>keymapCB</tabstop>
<tabstop>firstKeymapED</tabstop>
Index: QPrefLanguageUi.ui
===================================================================
--- QPrefLanguageUi.ui (revision 14826)
+++ QPrefLanguageUi.ui (working copy)
@@ -166,7 +166,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>defaultLanguageCO</tabstop>
<tabstop>languagePackageED</tabstop>
Index: QPrefLatexUi.ui
===================================================================
--- QPrefLatexUi.ui (revision 14826)
+++ QPrefLatexUi.ui (working copy)
@@ -246,7 +246,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>latexEncodingED</tabstop>
<tabstop>latexPaperSizeCO</tabstop>
Index: QPrefPathsUi.ui
===================================================================
--- QPrefPathsUi.ui (revision 14826)
+++ QPrefPathsUi.ui (working copy)
@@ -178,7 +178,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>workingDirED</tabstop>
<tabstop>workingDirPB</tabstop>
Index: QPrefPrinterUi.ui
===================================================================
--- QPrefPrinterUi.ui (revision 14826)
+++ QPrefPrinterUi.ui (working copy)
@@ -333,7 +333,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>printerNameED</tabstop>
<tabstop>printerAdaptCB</tabstop>
Index: QPrefSpellcheckerUi.ui
===================================================================
--- QPrefSpellcheckerUi.ui (revision 14826)
+++ QPrefSpellcheckerUi.ui (working copy)
@@ -182,7 +182,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>spellCommandCO</tabstop>
<tabstop>altLanguageED</tabstop>
Index: QPrefUi.ui
===================================================================
--- QPrefUi.ui (revision 14826)
+++ QPrefUi.ui (working copy)
@@ -473,7 +473,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>uiFileED</tabstop>
<tabstop>uiFilePB</tabstop>
Index: QPrintUi.ui
===================================================================
--- QPrintUi.ui (revision 14826)
+++ QPrintUi.ui (working copy)
@@ -322,7 +322,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>printerRB</tabstop>
<tabstop>printerED</tabstop>
Index: QRefUi.ui
===================================================================
--- QRefUi.ui (revision 14826)
+++ QRefUi.ui (working copy)
@@ -258,7 +258,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>bufferCO</tabstop>
<tabstop>sortCB</tabstop>
Index: QSearchUi.ui
===================================================================
--- QSearchUi.ui (revision 14826)
+++ QSearchUi.ui (working copy)
@@ -213,7 +213,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>findCO</tabstop>
<tabstop>replaceCO</tabstop>
Index: QSendtoUi.ui
===================================================================
--- QSendtoUi.ui (revision 14826)
+++ QSendtoUi.ui (working copy)
@@ -120,7 +120,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>okPB</tabstop>
<tabstop>applyPB</tabstop>
Index: QShowFileUi.ui
===================================================================
--- QShowFileUi.ui (revision 14826)
+++ QShowFileUi.ui (working copy)
@@ -66,7 +66,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<resources/>
<connections/>
</ui>
Index: QSpellcheckerUi.ui
===================================================================
--- QSpellcheckerUi.ui (revision 14826)
+++ QSpellcheckerUi.ui (working copy)
@@ -170,7 +170,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>wordED</tabstop>
<tabstop>replaceCO</tabstop>
Index: QTexinfoUi.ui
===================================================================
--- QTexinfoUi.ui (revision 14826)
+++ QTexinfoUi.ui (working copy)
@@ -173,7 +173,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>whatStyle</tabstop>
<tabstop>path</tabstop>
Index: QThesaurusUi.ui
===================================================================
--- QThesaurusUi.ui (revision 14826)
+++ QThesaurusUi.ui (working copy)
@@ -149,7 +149,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>entryED</tabstop>
<tabstop>replaceED</tabstop>
Index: QTocUi.ui
===================================================================
--- QTocUi.ui (revision 14826)
+++ QTocUi.ui (working copy)
@@ -172,7 +172,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<resources/>
<connections/>
</ui>
Index: QURLUi.ui
===================================================================
--- QURLUi.ui (revision 14826)
+++ QURLUi.ui (working copy)
@@ -120,7 +120,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>urlED</tabstop>
<tabstop>nameED</tabstop>
Index: QViewSourceUi.ui
===================================================================
--- QViewSourceUi.ui (revision 14826)
+++ QViewSourceUi.ui (working copy)
@@ -123,7 +123,7 @@
</item>
</layout>
</widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <pixmapfunction></pixmapfunction>
<tabstops>
<tabstop>viewSourceTV</tabstop>
<tabstop>closePB</tabstop>
