aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable full static.h on Windows.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-01-17 16:48:31 +03:00
parent 09747beea9
commit 3392ea560e
21 changed files with 456 additions and 467 deletions
src
app
puzzle
stable.h
tape
stable.h
valentina
stable.h
libs
fervor
stable.h
ifc
stable.h
qmuparser
stable.h
vdxf
stable.h
vformat
stable.h
vgeometry
stable.h
vlayout
stable.h
vmisc
stable.h
vobj
stable.h
vpatterndb
stable.h
vpropertyexplorer
stable.h
vtest
stable.h
vtools
stable.h
vwidgets
stable.h
test
CollectionTest
stable.h
ParserTest
stable.h
TranslationsTest
stable.h
ValentinaTest
stable.h

4
src/app/puzzle/stable.h
View File

@ -51,8 +51,6 @@
# include <QtXml> # include <QtXml>
#endif #endif
//In Windows you can't use same header in all modes.
#if !defined(Q_OS_WIN)
#ifdef QT_WIDGETS_LIB #ifdef QT_WIDGETS_LIB
# include <QtWidgets> # include <QtWidgets>
#endif #endif
@ -65,7 +63,6 @@
# include <QtPrintSupport> # include <QtPrintSupport>
#endif #endif
//Build doesn't work, if include this headers on Windows.
#ifdef QT_XMLPATTERNS_LIB #ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns> # include <QtXmlPatterns>
#endif #endif
@ -77,7 +74,6 @@
#ifdef QT_CONCURRENT_LIB #ifdef QT_CONCURRENT_LIB
# include <QtConcurrent> # include <QtConcurrent>
#endif #endif
#endif/*Q_OS_WIN*/
#endif /*__cplusplus*/ #endif /*__cplusplus*/

8
src/app/tape/stable.h
View File

@ -51,8 +51,10 @@
# include <QtXml> # include <QtXml>
#endif #endif
//In Windows you can't use same header in all modes. #ifdef QT_WINEXTRAS_LIB
#if !defined(Q_OS_WIN) # include <QtWinExtras>
#endif
#ifdef QT_WIDGETS_LIB #ifdef QT_WIDGETS_LIB
# include <QtWidgets> # include <QtWidgets>
#endif #endif
@ -65,7 +67,6 @@
# include <QtPrintSupport> # include <QtPrintSupport>
#endif #endif
//Build doesn't work, if include this headers on Windows.
#ifdef QT_XMLPATTERNS_LIB #ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns> # include <QtXmlPatterns>
#endif #endif
@ -77,7 +78,6 @@
#ifdef QT_CONCURRENT_LIB #ifdef QT_CONCURRENT_LIB
# include <QtConcurrent> # include <QtConcurrent>
#endif #endif
#endif/*Q_OS_WIN*/
#endif /*__cplusplus*/ #endif /*__cplusplus*/

4
src/app/valentina/stable.h
View File

@ -55,8 +55,6 @@
# include <QtWinExtras> # include <QtWinExtras>
#endif #endif
//In Windows you can't use same header in all modes.
#if !defined(Q_OS_WIN)
#ifdef QT_WIDGETS_LIB #ifdef QT_WIDGETS_LIB
# include <QtWidgets> # include <QtWidgets>
#endif #endif
@ -69,7 +67,6 @@
# include <QtPrintSupport> # include <QtPrintSupport>
#endif #endif
//Build doesn't work, if include this headers on Windows.
#ifdef QT_XMLPATTERNS_LIB #ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns> # include <QtXmlPatterns>
#endif #endif
@ -81,7 +78,6 @@
#ifdef QT_CONCURRENT_LIB #ifdef QT_CONCURRENT_LIB
# include <QtConcurrent> # include <QtConcurrent>
#endif #endif
#endif/*Q_OS_WIN*/
#endif /*__cplusplus*/ #endif /*__cplusplus*/

8
src/libs/fervor/stable.h
View File

@ -49,8 +49,10 @@
# include <QtXml> # include <QtXml>
#endif #endif
//In Windows you can't use same header in all modes. #ifdef QT_WINEXTRAS_LIB
#if !defined(Q_OS_WIN) # include <QtWinExtras>
#endif
#ifdef QT_WIDGETS_LIB #ifdef QT_WIDGETS_LIB
# include <QtWidgets> # include <QtWidgets>
#endif #endif
@ -63,7 +65,6 @@
# include <QtPrintSupport> # include <QtPrintSupport>
#endif #endif
//Build doesn't work, if include this headers on Windows.
#ifdef QT_XMLPATTERNS_LIB #ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns> # include <QtXmlPatterns>
#endif #endif
@ -75,7 +76,6 @@
#ifdef QT_CONCURRENT_LIB #ifdef QT_CONCURRENT_LIB
# include <QtConcurrent> # include <QtConcurrent>
#endif #endif
#endif/*Q_OS_WIN*/
#endif/*__cplusplus*/ #endif/*__cplusplus*/

8
src/libs/ifc/stable.h
View File

@ -49,8 +49,10 @@
# include <QtXml> # include <QtXml>
#endif #endif
//In Windows you can't use same header in all modes. #ifdef QT_WINEXTRAS_LIB
#if !defined(Q_OS_WIN) # include <QtWinExtras>
#endif
#ifdef QT_WIDGETS_LIB #ifdef QT_WIDGETS_LIB
# include <QtWidgets> # include <QtWidgets>
#endif #endif
@ -63,7 +65,6 @@
# include <QtPrintSupport> # include <QtPrintSupport>
#endif #endif
//Build doesn't work, if include this headers on Windows.
#ifdef QT_XMLPATTERNS_LIB #ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns> # include <QtXmlPatterns>
#endif #endif
@ -75,7 +76,6 @@
#ifdef QT_CONCURRENT_LIB #ifdef QT_CONCURRENT_LIB
# include <QtConcurrent> # include <QtConcurrent>
#endif #endif
#endif/*Q_OS_WIN*/
#endif/*__cplusplus*/ #endif/*__cplusplus*/

11
src/libs/qmuparser/stable.h
View File

@ -46,8 +46,10 @@
# include <QtXml> # include <QtXml>
#endif #endif
//In Windows you can't use same header in all modes. #ifdef QT_WINEXTRAS_LIB
#if !defined(Q_OS_WIN) # include <QtWinExtras>
#endif
#ifdef QT_WIDGETS_LIB #ifdef QT_WIDGETS_LIB
# include <QtWidgets> # include <QtWidgets>
#endif #endif
@ -60,7 +62,6 @@
# include <QtPrintSupport> # include <QtPrintSupport>
#endif #endif
//Build doesn't work, if include this headers on Windows.
#ifdef QT_XMLPATTERNS_LIB #ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns> # include <QtXmlPatterns>
#endif #endif
@ -68,11 +69,11 @@
#ifdef QT_NETWORK_LIB #ifdef QT_NETWORK_LIB
# include <QtNetwork> # include <QtNetwork>
#endif #endif
#endif/*Q_OS_WIN*/
#ifdef QT_CONCURRENT_LIB #ifdef QT_CONCURRENT_LIB
# include <QtConcurrent> # include <QtConcurrent>
#endif #endif
#endif
#endif/*__cplusplus*/
#endif // STABLE_H #endif // STABLE_H

8
src/libs/vdxf/stable.h
View File

@ -51,8 +51,10 @@
# include <QtXml> # include <QtXml>
#endif #endif
//In Windows you can't use same header in all modes. #ifdef QT_WINEXTRAS_LIB
#if !defined(Q_OS_WIN) # include <QtWinExtras>
#endif
#ifdef QT_WIDGETS_LIB #ifdef QT_WIDGETS_LIB
# include <QtWidgets> # include <QtWidgets>
#endif #endif
@ -65,7 +67,6 @@
# include <QtPrintSupport> # include <QtPrintSupport>
#endif #endif
//Build doesn't work, if include this headers on Windows.
#ifdef QT_XMLPATTERNS_LIB #ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns> # include <QtXmlPatterns>
#endif #endif
@ -77,7 +78,6 @@
#ifdef QT_CONCURRENT_LIB #ifdef QT_CONCURRENT_LIB
# include <QtConcurrent> # include <QtConcurrent>
#endif #endif
#endif/*Q_OS_WIN*/
#endif/*__cplusplus*/ #endif/*__cplusplus*/

8
src/libs/vformat/stable.h
View File

@ -49,8 +49,10 @@
# include <QtXml> # include <QtXml>
#endif #endif
//In Windows you can't use same header in all modes. #ifdef QT_WINEXTRAS_LIB
#if !defined(Q_OS_WIN) # include <QtWinExtras>
#endif
#ifdef QT_WIDGETS_LIB #ifdef QT_WIDGETS_LIB
# include <QtWidgets> # include <QtWidgets>
#endif #endif
@ -63,7 +65,6 @@
# include <QtPrintSupport> # include <QtPrintSupport>
#endif #endif
//Build doesn't work, if include this headers on Windows.
#ifdef QT_XMLPATTERNS_LIB #ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns> # include <QtXmlPatterns>
#endif #endif
@ -75,7 +76,6 @@
#ifdef QT_CONCURRENT_LIB #ifdef QT_CONCURRENT_LIB
# include <QtConcurrent> # include <QtConcurrent>
#endif #endif
#endif/*Q_OS_WIN*/
#endif/*__cplusplus*/ #endif/*__cplusplus*/

8
src/libs/vgeometry/stable.h
View File

@ -49,8 +49,10 @@
# include <QtXml> # include <QtXml>
#endif #endif
//In Windows you can't use same header in all modes. #ifdef QT_WINEXTRAS_LIB
#if !defined(Q_OS_WIN) # include <QtWinExtras>
#endif
#ifdef QT_WIDGETS_LIB #ifdef QT_WIDGETS_LIB
# include <QtWidgets> # include <QtWidgets>
#endif #endif
@ -63,7 +65,6 @@
# include <QtPrintSupport> # include <QtPrintSupport>
#endif #endif
//Build doesn't work, if include this headers on Windows.
#ifdef QT_XMLPATTERNS_LIB #ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns> # include <QtXmlPatterns>
#endif #endif
@ -75,7 +76,6 @@
#ifdef QT_CONCURRENT_LIB #ifdef QT_CONCURRENT_LIB
# include <QtConcurrent> # include <QtConcurrent>
#endif #endif
#endif/*Q_OS_WIN*/
#endif/*__cplusplus*/ #endif/*__cplusplus*/

8
src/libs/vlayout/stable.h
View File

@ -49,8 +49,10 @@
# include <QtXml> # include <QtXml>
#endif #endif
//In Windows you can't use same header in all modes. #ifdef QT_WINEXTRAS_LIB
#if !defined(Q_OS_WIN) # include <QtWinExtras>
#endif
#ifdef QT_WIDGETS_LIB #ifdef QT_WIDGETS_LIB
# include <QtWidgets> # include <QtWidgets>
#endif #endif
@ -63,7 +65,6 @@
# include <QtPrintSupport> # include <QtPrintSupport>
#endif #endif
//Build doesn't work, if include this headers on Windows.
#ifdef QT_XMLPATTERNS_LIB #ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns> # include <QtXmlPatterns>
#endif #endif
@ -75,7 +76,6 @@
#ifdef QT_CONCURRENT_LIB #ifdef QT_CONCURRENT_LIB
# include <QtConcurrent> # include <QtConcurrent>
#endif #endif
#endif/*Q_OS_WIN*/
#endif/*__cplusplus*/ #endif/*__cplusplus*/

4
src/libs/vmisc/stable.h
View File

@ -49,8 +49,6 @@
# include <QtXml> # include <QtXml>
#endif #endif
//In Windows you can't use same header in all modes.
#if !defined(Q_OS_WIN)
#ifdef QT_WIDGETS_LIB #ifdef QT_WIDGETS_LIB
# include <QtWidgets> # include <QtWidgets>
#endif #endif
@ -63,7 +61,6 @@
# include <QtPrintSupport> # include <QtPrintSupport>
#endif #endif
//Build doesn't work, if include this headers on Windows.
#ifdef QT_XMLPATTERNS_LIB #ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns> # include <QtXmlPatterns>
#endif #endif
@ -75,7 +72,6 @@
#ifdef QT_CONCURRENT_LIB #ifdef QT_CONCURRENT_LIB
# include <QtConcurrent> # include <QtConcurrent>
#endif #endif
#endif/*Q_OS_WIN*/
#endif/*__cplusplus*/ #endif/*__cplusplus*/

8
src/libs/vobj/stable.h
View File

@ -49,8 +49,10 @@
# include <QtXml> # include <QtXml>
#endif #endif
//In Windows you can't use same header in all modes. #ifdef QT_WINEXTRAS_LIB
#if !defined(Q_OS_WIN) # include <QtWinExtras>
#endif
#ifdef QT_WIDGETS_LIB #ifdef QT_WIDGETS_LIB
# include <QtWidgets> # include <QtWidgets>
#endif #endif
@ -63,7 +65,6 @@
# include <QtPrintSupport> # include <QtPrintSupport>
#endif #endif
//Build doesn't work, if include this headers on Windows.
#ifdef QT_XMLPATTERNS_LIB #ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns> # include <QtXmlPatterns>
#endif #endif
@ -75,7 +76,6 @@
#ifdef QT_CONCURRENT_LIB #ifdef QT_CONCURRENT_LIB
# include <QtConcurrent> # include <QtConcurrent>
#endif #endif
#endif/*Q_OS_WIN*/
#endif/*__cplusplus*/ #endif/*__cplusplus*/

8
src/libs/vpatterndb/stable.h
View File

@ -49,8 +49,10 @@
# include <QtXml> # include <QtXml>
#endif #endif
//In Windows you can't use same header in all modes. #ifdef QT_WINEXTRAS_LIB
#if !defined(Q_OS_WIN) # include <QtWinExtras>
#endif
#ifdef QT_WIDGETS_LIB #ifdef QT_WIDGETS_LIB
# include <QtWidgets> # include <QtWidgets>
#endif #endif
@ -63,7 +65,6 @@
# include <QtPrintSupport> # include <QtPrintSupport>
#endif #endif
//Build doesn't work, if include this headers on Windows.
#ifdef QT_XMLPATTERNS_LIB #ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns> # include <QtXmlPatterns>
#endif #endif
@ -75,7 +76,6 @@
#ifdef QT_CONCURRENT_LIB #ifdef QT_CONCURRENT_LIB
# include <QtConcurrent> # include <QtConcurrent>
#endif #endif
#endif/*Q_OS_WIN*/
#endif/*__cplusplus*/ #endif/*__cplusplus*/

8
src/libs/vpropertyexplorer/stable.h
View File

@ -42,8 +42,10 @@
# include <QtXml> # include <QtXml>
#endif #endif
//In Windows you can't use same header in all modes. #ifdef QT_WINEXTRAS_LIB
#if !defined(Q_OS_WIN) # include <QtWinExtras>
#endif
#ifdef QT_WIDGETS_LIB #ifdef QT_WIDGETS_LIB
# include <QtWidgets> # include <QtWidgets>
#endif #endif
@ -56,7 +58,6 @@
# include <QtPrintSupport> # include <QtPrintSupport>
#endif #endif
//Build doesn't work, if include this headers on Windows.
#ifdef QT_XMLPATTERNS_LIB #ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns> # include <QtXmlPatterns>
#endif #endif
@ -68,7 +69,6 @@
#ifdef QT_CONCURRENT_LIB #ifdef QT_CONCURRENT_LIB
# include <QtConcurrent> # include <QtConcurrent>
#endif #endif
#endif/*Q_OS_WIN*/
#endif /*__cplusplus*/ #endif /*__cplusplus*/

8
src/libs/vtest/stable.h
View File

@ -53,8 +53,10 @@
# include <QtTest> # include <QtTest>
#endif #endif
//In Windows you can't use same header in all modes. #ifdef QT_WINEXTRAS_LIB
#if !defined(Q_OS_WIN) # include <QtWinExtras>
#endif
#ifdef QT_WIDGETS_LIB #ifdef QT_WIDGETS_LIB
# include <QtWidgets> # include <QtWidgets>
#endif #endif
@ -67,7 +69,6 @@
# include <QtPrintSupport> # include <QtPrintSupport>
#endif #endif
//Build doesn't work, if include this headers on Windows.
#ifdef QT_XMLPATTERNS_LIB #ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns> # include <QtXmlPatterns>
#endif #endif
@ -79,7 +80,6 @@
#ifdef QT_CONCURRENT_LIB #ifdef QT_CONCURRENT_LIB
# include <QtConcurrent> # include <QtConcurrent>
#endif #endif
#endif/*Q_OS_WIN*/
#endif/*__cplusplus*/ #endif/*__cplusplus*/

8
src/libs/vtools/stable.h
View File

@ -51,8 +51,10 @@
# include <QtXml> # include <QtXml>
#endif #endif
//In Windows you can't use same header in all modes. #ifdef QT_WINEXTRAS_LIB
#if !defined(Q_OS_WIN) # include <QtWinExtras>
#endif
#ifdef QT_WIDGETS_LIB #ifdef QT_WIDGETS_LIB
# include <QtWidgets> # include <QtWidgets>
#endif #endif
@ -65,7 +67,6 @@
# include <QtPrintSupport> # include <QtPrintSupport>
#endif #endif
//Build doesn't work, if include this headers on Windows.
#ifdef QT_XMLPATTERNS_LIB #ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns> # include <QtXmlPatterns>
#endif #endif
@ -77,7 +78,6 @@
#ifdef QT_CONCURRENT_LIB #ifdef QT_CONCURRENT_LIB
# include <QtConcurrent> # include <QtConcurrent>
#endif #endif
#endif/*Q_OS_WIN*/
#endif /*__cplusplus*/ #endif /*__cplusplus*/

8
src/libs/vwidgets/stable.h
View File

@ -49,8 +49,10 @@
# include <QtXml> # include <QtXml>
#endif #endif
//In Windows you can't use same header in all modes. #ifdef QT_WINEXTRAS_LIB
#if !defined(Q_OS_WIN) # include <QtWinExtras>
#endif
#ifdef QT_WIDGETS_LIB #ifdef QT_WIDGETS_LIB
# include <QtWidgets> # include <QtWidgets>
#endif #endif
@ -63,7 +65,6 @@
# include <QtPrintSupport> # include <QtPrintSupport>
#endif #endif
//Build doesn't work, if include this headers on Windows.
#ifdef QT_XMLPATTERNS_LIB #ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns> # include <QtXmlPatterns>
#endif #endif
@ -75,7 +76,6 @@
#ifdef QT_CONCURRENT_LIB #ifdef QT_CONCURRENT_LIB
# include <QtConcurrent> # include <QtConcurrent>
#endif #endif
#endif/*Q_OS_WIN*/
#endif/*__cplusplus*/ #endif/*__cplusplus*/

8
src/test/CollectionTest/stable.h
View File

@ -55,8 +55,10 @@
# include <QtTest> # include <QtTest>
#endif #endif
//In Windows you can't use same header in all modes. #ifdef QT_WINEXTRAS_LIB
#if !defined(Q_OS_WIN) # include <QtWinExtras>
#endif
#ifdef QT_WIDGETS_LIB #ifdef QT_WIDGETS_LIB
# include <QtWidgets> # include <QtWidgets>
#endif #endif
@ -69,7 +71,6 @@
# include <QtPrintSupport> # include <QtPrintSupport>
#endif #endif
//Build doesn't work, if include this headers on Windows.
#ifdef QT_XMLPATTERNS_LIB #ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns> # include <QtXmlPatterns>
#endif #endif
@ -81,7 +82,6 @@
#ifdef QT_CONCURRENT_LIB #ifdef QT_CONCURRENT_LIB
# include <QtConcurrent> # include <QtConcurrent>
#endif #endif
#endif/*Q_OS_WIN*/
#endif /*__cplusplus*/ #endif /*__cplusplus*/

8
src/test/ParserTest/stable.h
View File

@ -53,8 +53,10 @@
# include <QtTest> # include <QtTest>
#endif #endif
//In Windows you can't use same header in all modes. #ifdef QT_WINEXTRAS_LIB
#if !defined(Q_OS_WIN) # include <QtWinExtras>
#endif
#ifdef QT_WIDGETS_LIB #ifdef QT_WIDGETS_LIB
# include <QtWidgets> # include <QtWidgets>
#endif #endif
@ -67,7 +69,6 @@
# include <QtPrintSupport> # include <QtPrintSupport>
#endif #endif
//Build doesn't work, if include this headers on Windows.
#ifdef QT_XMLPATTERNS_LIB #ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns> # include <QtXmlPatterns>
#endif #endif
@ -79,7 +80,6 @@
#ifdef QT_CONCURRENT_LIB #ifdef QT_CONCURRENT_LIB
# include <QtConcurrent> # include <QtConcurrent>
#endif #endif
#endif/*Q_OS_WIN*/
#endif #endif

8
src/test/TranslationsTest/stable.h
View File

@ -55,8 +55,10 @@
# include <QtTest> # include <QtTest>
#endif #endif
//In Windows you can't use same header in all modes. #ifdef QT_WINEXTRAS_LIB
#if !defined(Q_OS_WIN) # include <QtWinExtras>
#endif
#ifdef QT_WIDGETS_LIB #ifdef QT_WIDGETS_LIB
# include <QtWidgets> # include <QtWidgets>
#endif #endif
@ -69,7 +71,6 @@
# include <QtPrintSupport> # include <QtPrintSupport>
#endif #endif
//Build doesn't work, if include this headers on Windows.
#ifdef QT_XMLPATTERNS_LIB #ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns> # include <QtXmlPatterns>
#endif #endif
@ -81,7 +82,6 @@
#ifdef QT_CONCURRENT_LIB #ifdef QT_CONCURRENT_LIB
# include <QtConcurrent> # include <QtConcurrent>
#endif #endif
#endif/*Q_OS_WIN*/
#endif /*__cplusplus*/ #endif /*__cplusplus*/

8
src/test/ValentinaTest/stable.h
View File

@ -55,8 +55,10 @@
# include <QtTest> # include <QtTest>
#endif #endif
//In Windows you can't use same header in all modes. #ifdef QT_WINEXTRAS_LIB
#if !defined(Q_OS_WIN) # include <QtWinExtras>
#endif
#ifdef QT_WIDGETS_LIB #ifdef QT_WIDGETS_LIB
# include <QtWidgets> # include <QtWidgets>
#endif #endif
@ -69,7 +71,6 @@
# include <QtPrintSupport> # include <QtPrintSupport>
#endif #endif
//Build doesn't work, if include this headers on Windows.
#ifdef QT_XMLPATTERNS_LIB #ifdef QT_XMLPATTERNS_LIB
# include <QtXmlPatterns> # include <QtXmlPatterns>
#endif #endif
@ -81,7 +82,6 @@
#ifdef QT_CONCURRENT_LIB #ifdef QT_CONCURRENT_LIB
# include <QtConcurrent> # include <QtConcurrent>
#endif #endif
#endif/*Q_OS_WIN*/
#endif /*__cplusplus*/ #endif /*__cplusplus*/