Re: Qt >= 4.5 for LyX 2.1

2012-11-03 Thread Pavel Sanda
Richard Heck wrote:
> On 10/28/2012 02:18 PM, Pavel Sanda wrote:
>> Jean-Marc Lasgouttes wrote:
>>> I think using 4.5 as baseline would be very safe and allow for code
>>> simplification.
>> Anyone against this?
>>
> I know there are sometimes issues with cygwin, so we should wait to hear 
> about that. But it's clear that a lot of this could go, then:

Citing Enrico:
The official cygwin distribution currently ships Qt 4.7.4, while I  

   
am using Qt 4.8.3 for my builds. So, no problem.

P


Re: Qt >= 4.5 for LyX 2.1

2012-10-29 Thread Jean-Marc Lasgouttes

Le 28/10/2012 19:36, Richard Heck a écrit :

On 10/28/2012 02:18 PM, Pavel Sanda wrote:

Jean-Marc Lasgouttes wrote:

I think using 4.5 as baseline would be very safe and allow for code
simplification.

Anyone against this?


I know there are sometimes issues with cygwin, so we should wait to hear
about that. But it's clear that a lot of this could go, then:


More precisely:
fantomas: git grep 'QT_VERSION.*0x04' src|sed 
's/^.*\(0x[0-9]*\).*$/\1/'|sort|uniq -c

  3 0x040200
  3 0x040202
  1 0x040203
 12 0x040300
  1 0x040304
 16 0x040400
  8 0x040500
  1 0x040502
 14 0x040600
  1 0x040700
  1 0x040800

Nearly 3/4 of the code specializations can go away if we require qt 4.5.

JMarc




Re: Qt >= 4.5 for LyX 2.1

2012-10-28 Thread Pavel Sanda
Richard Heck wrote:
> On 10/28/2012 02:18 PM, Pavel Sanda wrote:
>> Jean-Marc Lasgouttes wrote:
>>> I think using 4.5 as baseline would be very safe and allow for code
>>> simplification.
>> Anyone against this?
>>
> I know there are sometimes issues with cygwin, so we should wait to hear 
> about that. But it's clear that a lot of this could go, then:

IIRC cygwin ships Qt >= 4.5 for a long time.
Pavel


Re: Qt >= 4.5 for LyX 2.1

2012-10-28 Thread Richard Heck

On 10/28/2012 02:18 PM, Pavel Sanda wrote:

Jean-Marc Lasgouttes wrote:

I think using 4.5 as baseline would be very safe and allow for code
simplification.

Anyone against this?

I know there are sometimes issues with cygwin, so we should wait to hear 
about that. But it's clear that a lot of this could go, then:


../lyx-devel/src/ [⚡ master] > grep -R QT_VERSION *
Buffer.cpp: /// is still here to allow (QT_VERSION < 0x040400).
frontends/qt4/FancyLineEdit.cpp:#if QT_VERSION >= 0x040600
frontends/qt4/FancyLineEdit.cpp:#endif // QT_VERSION >= 0x040600
frontends/qt4/TocModel.cpp: #if QT_VERSION >= 0x040600
frontends/qt4/TocModel.cpp: #if QT_VERSION >= 0x040600
frontends/qt4/TocModel.cpp:#if QT_VERSION >= 0x040300
frontends/qt4/TocModel.cpp:#if QT_VERSION >= 0x040300
frontends/qt4/GuiAbout.cpp: out << "Qt Version (compile-time): " << 
QT_VERSION_STR << "\n";

frontends/qt4/GuiCharacter.cpp:#if QT_VERSION >= 0x040200
frontends/qt4/LyXFileDialog.cpp:#if QT_VERSION < 0x040304
frontends/qt4/GuiWorkArea.h:#if QT_VERSION < 0x040300
frontends/qt4/InGuiThread.h:#if QT_VERSION < 0x040400
frontends/qt4/Menus.cpp:#if QT_VERSION >= 0x040600
frontends/qt4/Menus.cpp:#if defined(Q_WS_WIN) && (QT_VERSION >= 0x040600)
frontends/qt4/Menus.cpp:#if defined(Q_WS_WIN) && (QT_VERSION >= 0x040600)
frontends/qt4/GuiWorkArea.cpp:#if QT_VERSION < 0x040500
frontends/qt4/GuiWorkArea.cpp:#if QT_VERSION >= 0x040500
frontends/qt4/GuiWorkArea.cpp:#if QT_VERSION >= 0x040500
frontends/qt4/GuiWorkArea.cpp:#if QT_VERSION >= 0x040500
frontends/qt4/GuiWorkArea.cpp:#if QT_VERSION < 0x040300
frontends/qt4/GuiWorkArea.cpp:#if QT_VERSION >= 0x040300
frontends/qt4/GuiSymbols.cpp:#if QT_VERSION >= 0x040300
frontends/qt4/GuiFontLoader.cpp:#if QT_VERSION >= 0x040300 //&& 
QT_VERSION < 0x040800

frontends/qt4/GuiPrefs.cpp:#if QT_VERSION > 0x040600
frontends/qt4/GuiPrefs.cpp:#if QT_VERSION < 0x040500
frontends/qt4/GuiPrefs.cpp:#if QT_VERSION < 0x040500
frontends/qt4/GuiPrefs.cpp:#if QT_VERSION >= 0x040200
frontends/qt4/Makefile.in:QT_VERSION = $(shell IFS=.; set -- `echo 
$(QT4_VERSION)`; \
frontends/qt4/Makefile.in: $(AM_V_GEN)$(MOC4) -DQT_VERSION=$(QT_VERSION) 
-o $@ $<

frontends/qt4/FancyLineEdit.h:#if QT_VERSION >= 0x040600
frontends/qt4/FancyLineEdit.h:#if QT_VERSION >= 0x040600
frontends/qt4/FancyLineEdit.h:#endif // QT_VERSION >= 0x040600*/
frontends/qt4/PanelStack.cpp:#if QT_VERSION >= 0x040700
frontends/qt4/PanelStack.cpp:#if QT_VERSION >= 0x040600
frontends/qt4/GuiApplication.cpp:#if QT_VERSION >= 0x040400
frontends/qt4/GuiApplication.cpp:#if QT_VERSION >= 0x040400
frontends/qt4/GuiApplication.cpp:#if QT_VERSION > 0x040600
frontends/qt4/GuiApplication.cpp:#if QT_VERSION >= 0x040300
frontends/qt4/GuiDocument.cpp:#if QT_VERSION >= 0x040200
frontends/qt4/Makefile.am:QT_VERSION = $(shell IFS=.; set -- `echo 
$(QT4_VERSION)`; \
frontends/qt4/Makefile.am: $(AM_V_GEN)$(MOC4) -DQT_VERSION=$(QT_VERSION) 
-o $@ $<

frontends/qt4/TocWidget.cpp:#if QT_VERSION >= 0x040300
frontends/qt4/GuiView.cpp:#if (QT_VERSION >= 0x040400)
frontends/qt4/GuiView.cpp:#if (QT_VERSION >= 0x040400)
frontends/qt4/GuiView.cpp:#if (QT_VERSION >= 0x040400)
frontends/qt4/GuiView.cpp:#if (QT_VERSION >= 0x040600)
frontends/qt4/GuiView.cpp:#if (QT_VERSION >= 0x040300)
frontends/qt4/GuiView.cpp:#if (QT_VERSION >= 0x040400)
frontends/qt4/GuiView.cpp:#if QT_VERSION >= 0x040400
frontends/qt4/GuiView.cpp:#if (QT_VERSION >= 0x040202)
frontends/qt4/GuiView.cpp:#if (QT_VERSION >= 0x040202)
frontends/qt4/GuiView.cpp:#if (QT_VERSION >= 0x040202)
frontends/qt4/GuiView.cpp:#if (!defined Q_WS_X11) || (QT_VERSION >= 
0x040500)

frontends/qt4/GuiView.cpp:#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
frontends/qt4/GuiView.cpp:#if (QT_VERSION >= 0x040400)
frontends/qt4/GuiView.cpp:#if (QT_VERSION >= 0x040400)
frontends/qt4/GuiView.cpp:#if (QT_VERSION >= 0x040400)
frontends/qt4/GuiView.cpp:#if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
frontends/qt4/GuiView.cpp:#if QT_VERSION < 0x040400
frontends/qt4/GuiView.cpp:#if QT_VERSION >= 0x040300
frontends/qt4/GuiView.cpp:#if QT_VERSION >= 0x040300
frontends/qt4/GuiView.cpp:#if QT_VERSION >= 0x040300
frontends/qt4/FileDialog.cpp:#if QT_VERSION != 0x040203
frontends/qt4/GuiImage.cpp:#if (QT_VERSION >= 0x040500) && (QT_VERSION 
<= 0x040502)

support/lyxtime.cpp:#if QT_VERSION >= 0x040400
support/FileName.cpp:#if defined(_WIN32) || (QT_VERSION >= 0x040500)
support/FileName.cpp:#if QT_VERSION >= 0x99
support/FileName.cpp:#else // QT_VERSION
support/FileName.cpp:#endif // QT_VERSION




Qt >= 4.5 for LyX 2.1 (was: Compilers used for compiling LyX?)

2012-10-28 Thread Pavel Sanda
Jean-Marc Lasgouttes wrote:
> I think using 4.5 as baseline would be very safe and allow for code 
> simplification.

Anyone against this?
Pavel