[LyX features/remotes/origin/killqt4] Amend ac248e39, get rid of Qt4 code also in cmake build

[Scott Kostyshak]

On Sat, Nov 19, 2022 at 09:34:41PM +0100, Kornel Benko wrote:
> Am Sat, 19 Nov 2022 15:13:41 -0500
> schrieb Scott Kostyshak <skostysh at lyx.org>:
> 
> > On Sat, Nov 19, 2022 at 07:09:51PM +0100, Kornel Benko wrote:
> > > Am Sat, 19 Nov 2022 11:50:44 -0500
> > > schrieb Scott Kostyshak <skostysh at lyx.org>:
> > >   
> > > > git branch killqt4 --set-upstream-to features/killqt4  
> > > 
> > > I get
> > > fatal: branch 'killqt4' does not exist
> > > Exit 128
> > > 
> > > 
> > > Sorry, I am lost. I cannot even remove the wrong branch.
> > > 
> > >  $ git branch -r | grep kill
> > >   origin/kill-print
> > >   origin/kill-tex2lyx-define
> > >   origin/killqt4
> > >   origin/remotes/origin/killqt4
> > > 
> > >   $  git branch -D origin/remotes/origin/killqt4
> > > error: branch 'origin/remotes/origin/killqt4' not found.
> > > Exit 1  
> > 
> > What do you get when you do the following?
> > 
> >   git checkout killqt4
> 
> It switches to NEW branch killqt4 (not an existing one)
> 
> Branch 'killqt4' set up to track remote branch 'killqt4' from 'origin'.
> Switched to a new branch 'killqt4'

OK, next attempt: first, make sure you don't have any unsaved work on
'killqt4' branch. If you do, make a patch for your saved work and back
it up, because we will delete your local branch:

  git branch -d killqt4

Actually, you might have to use "-D" instead of "-d".

Then, do:

  git checkout --track features/killqt4

Finally, as a check do:

  git push -n

What is the output from those commands?

> > If that doesn't work, do you want me to try to push the commit you made?
> > 
> > Scott
> 
> Yes please.

Done, seems to have gone well.

Scott
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://lists.lyx.org/pipermail/lyx-devel/attachments/20221119/8c15c9a9/attachment.asc>