merge two project source codes

[davidovv]

How did you add namespaces if you did not change the files?

I created new class inside new SecondStatic.pro that inherits Second MainWindow, and tried to use that class, and there tried with namespaces and typedefs, but no success.
Maybe it looks silly but i had a feeling it could work.

patches that are applied to the original

That is what i am doing now (manually, with diff tool, meld, i compare my file with the one from svn) and i was trying to avoid that. I dont see how some automatic patch could work on next version of file.

use defines have the preprocessor replace names that would otherwise clash

I will see more about that.

[anda_skoa]

I created new class inside new SecondStatic.pro that inherits Second MainWindow, and tried to use that class, and there tried with namespaces and typedefs, but no success.

You could try with a dynamic library and symbol visibility set to hidden, so that only explicitly exported symbols are seen by the linker.
But the best approach is to avoid the same symbols alltogether of course.

Cheers,
_

[davidovv]

this is the the first time i actually try to build library, so most of the time i have to google what are you talking about.
Dynamic library with hide_symbols works, thanks.