Correct pro files

2025-04-18 14:04:06 +03:00 · 2023-04-07 10:30:23 +03:00 · 2023-04-07 10:30:23 +03:00 · eb45d8dadc
commit eb45d8dadc
parent 3621bea6e1
32 changed files with 7 additions and 117 deletions
--- a/Common/kernel.pro
+++ b/Common/kernel.pro
@ -8,8 +8,6 @@ TEMPLATE = lib
 CONFIG += shared
 CONFIG += plugin

-CONFIG += core_static_link_libstd
-
 DEFINES += KERNEL_USE_DYNAMIC_LIBRARY_BUILDING

 # CONFIG
--- a/DesktopEditor/AllFontsGen/AllFontsGen.pro
+++ b/DesktopEditor/AllFontsGen/AllFontsGen.pro
@ -33,8 +33,4 @@ core_windows {
    LIBS += -lUser32
 }

-core_linux {
-    QMAKE_LFLAGS += -Wl,--rpath=./
-}
-
 SOURCES += main.cpp
--- a/DesktopEditor/allthemesgen/allthemesgen.pro
+++ b/DesktopEditor/allthemesgen/allthemesgen.pro
@ -27,8 +27,4 @@ core_windows {
    LIBS += -lUser32
 }

-core_linux {
-    QMAKE_LFLAGS += -Wl,--rpath=./
-}
-
 SOURCES += main.cpp
--- a/DesktopEditor/doctrenderer/app_builder/docbuilder.pro
+++ b/DesktopEditor/doctrenderer/app_builder/docbuilder.pro
@ -19,8 +19,6 @@ DEFINES += INTVER=$$BINARYVERSION

 TEMPLATE = app

-CONFIG += core_static_link_libstd
-
 CORE_ROOT_DIR = $$PWD/../../../../core
 PWD_ROOT_DIR = $$PWD
 include($$CORE_ROOT_DIR/Common/base.pri)
--- a/DesktopEditor/doctrenderer/app_builder_lib/test.pro
+++ b/DesktopEditor/doctrenderer/app_builder_lib/test.pro
@ -7,8 +7,6 @@ CONFIG   -= app_bundle

 TEMPLATE = app

-CONFIG += core_static_link_libstd
-
 CORE_ROOT_DIR = $$PWD/../../../../core
 PWD_ROOT_DIR = $$PWD
 include($$CORE_ROOT_DIR/Common/base.pri)
--- a/DesktopEditor/doctrenderer/doctrenderer.pro
+++ b/DesktopEditor/doctrenderer/doctrenderer.pro
@ -8,10 +8,6 @@ TEMPLATE = lib
 CONFIG += shared
 CONFIG += plugin

-CONFIG += c++11
-
-CONFIG += core_static_link_libstd
-
 CORE_ROOT_DIR = $$PWD/../..
 PWD_ROOT_DIR = $$PWD
 include(../../Common/base.pri)
--- a/DesktopEditor/doctrenderer/js_internal/v8/inspector/v8-debug.pro
+++ b/DesktopEditor/doctrenderer/js_internal/v8/inspector/v8-debug.pro
@ -1,7 +1,7 @@
 CORE_BUILDS_PLATFORM_PREFIX = win_64
 BUILD_MODE=debug

-CONFIG += c++11 console
+CONFIG += console
 CONFIG -= app_bundle
 CONFIG -= qt

--- a/DesktopEditor/raster/Metafile/test/DisplayingXML/DisplayingXML.pro
+++ b/DesktopEditor/raster/Metafile/test/DisplayingXML/DisplayingXML.pro
@ -3,8 +3,6 @@ QT       += xml

 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets

-CONFIG += c++11
-
 DEFINES += METAFILE_SUPPORT_WMF_EMF

 # You can make your code fail to compile if it uses deprecated APIs.
--- a/DesktopEditor/raster/Metafile/test/MetafileToSvg/MetafileToSvg.pro
+++ b/DesktopEditor/raster/Metafile/test/MetafileToSvg/MetafileToSvg.pro
@ -11,8 +11,6 @@ QT       -= gui
 TARGET = test
 CONFIG   += console
 CONFIG   -= app_bundle
-
-CONFIG += c++11
 TEMPLATE = app

 CORE_ROOT_DIR = $$PWD/../../../../..
--- a/DesktopEditor/raster/Metafile/test/test.pro
+++ b/DesktopEditor/raster/Metafile/test/test.pro
@ -11,8 +11,6 @@ QT       -= gui
 TARGET = test
 CONFIG   += console
 CONFIG   -= app_bundle
-
-CONFIG += c++11
 TEMPLATE = app

 CORE_ROOT_DIR = $$PWD/../../../..
--- a/DesktopEditor/xmlsec/src/ooxmlsignature.pro
+++ b/DesktopEditor/xmlsec/src/ooxmlsignature.pro
@ -8,10 +8,6 @@ TEMPLATE = lib
 CONFIG += shared
 CONFIG += plugin

-CONFIG += c++11
-
-CONFIG += core_static_link_libstd
-
 CORE_ROOT_DIR = $$PWD/../../..
 PWD_ROOT_DIR = $$PWD
 include($$CORE_ROOT_DIR/Common/base.pri)
--- a/DesktopEditor/xmlsec/test/OpenSSL_gui_test/OpenSSL_gui_test.pro
+++ b/DesktopEditor/xmlsec/test/OpenSSL_gui_test/OpenSSL_gui_test.pro
@ -19,11 +19,6 @@ CORE_ROOT_DIR = $$PWD/../../../..
 PWD_ROOT_DIR = $$PWD
 include($$CORE_ROOT_DIR/Common/base.pri)

-core_linux {
-    QMAKE_LFLAGS += -Wl,--rpath=./
-    QMAKE_LFLAGS += -static-libstdc++ -static-libgcc
-}
-
 DEFINES += XMLSEC_OPENSSL_110
 #DEFINES += "OPENSSL_API_COMPAT=\"0x10100000\""

--- a/DjVuFile/DjVuFile.pro
+++ b/DjVuFile/DjVuFile.pro
@ -7,8 +7,6 @@ TEMPLATE = lib
 CONFIG += shared
 CONFIG += plugin

-CONFIG += core_static_link_libstd
-
 DEFINES += DJVU_USE_DYNAMIC_LIBRARY

 CORE_ROOT_DIR = $$PWD/..
--- a/DocxRenderer/DocxRenderer.pro
+++ b/DocxRenderer/DocxRenderer.pro
@ -7,8 +7,6 @@ TEMPLATE = lib
 CONFIG += shared
 CONFIG += plugin

-CONFIG += core_static_link_libstd
-
 CORE_ROOT_DIR = $$PWD/..
 PWD_ROOT_DIR = $$PWD
 include(../Common/base.pri)
--- a/DocxRenderer/test/test.pro
+++ b/DocxRenderer/test/test.pro
@ -4,9 +4,6 @@ QT -= core gui
 TARGET = test
 CONFIG   += console
 CONFIG   -= app_bundle
-
-CONFIG += c++11
-
 TEMPLATE = app

 CORE_ROOT_DIR = $$PWD/../..
--- a/EpubFile/CEpubFile.pro
+++ b/EpubFile/CEpubFile.pro
@ -7,8 +7,6 @@ TEMPLATE = lib
 CONFIG += shared
 CONFIG += plugin

-CONFIG += core_static_link_libstd
-
 DEFINES += EPUBFILE_USE_DYNAMIC_LIBRARY

 CORE_ROOT_DIR = $$PWD/..
--- a/Fb2File/Fb2File.pro
+++ b/Fb2File/Fb2File.pro
@ -7,7 +7,6 @@ TEMPLATE = lib

 CONFIG += shared
 CONFIG += plugin
-CONFIG += core_static_link_libstd

 DEFINES += FB2FILE_USE_DYNAMIC_LIBRARY

--- a/HtmlFile/HtmlFile.pro
+++ b/HtmlFile/HtmlFile.pro
@ -7,8 +7,6 @@ TEMPLATE = lib
 CONFIG += shared
 CONFIG += plugin

-CONFIG += core_static_link_libstd
-
 DEFINES += HTMLFILE_USE_DYNAMIC_LIBRARY
 DEFINES += UNICODECONVERTER_USE_DYNAMIC_LIBRARY

--- a/HtmlFile/test/test.pro
+++ b/HtmlFile/test/test.pro
@ -27,16 +27,10 @@ CONFIG(debug, debug|release) {
    DESTDIR = $$PWD/Release
 }

-CONFIG += c++11
 TEMPLATE = app

 LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter -lkernel -lgraphics -lHtmlFile

-linux-g++ | linux-g++-64 | linux-g++-32 {
-    QMAKE_LFLAGS += -Wl,--rpath=./
-    message(linux)
-}
-
 win32 {
 LIBS += -ladvapi32 \
        -luser32 \
--- a/HtmlFile2/HtmlFile2.pro
+++ b/HtmlFile2/HtmlFile2.pro
@ -7,7 +7,6 @@ TEMPLATE = lib

 CONFIG += shared
 CONFIG += plugin
-CONFIG += core_static_link_libstd

 DEFINES += HTMLFILE2_USE_DYNAMIC_LIBRARY
 DEFINES += CSSCALCULATOR_LIBRARY_STATIC
--- a/HtmlRenderer/htmlrenderer.pro
+++ b/HtmlRenderer/htmlrenderer.pro
@ -8,8 +8,6 @@ TEMPLATE = lib
 CONFIG += shared
 CONFIG += plugin

-CONFIG += core_static_link_libstd
-
 DEFINES += HTMLRENDERER_USE_DYNAMIC_LIBRARY

 CORE_ROOT_DIR = $$PWD/..
--- a/HtmlRenderer/test/test.pro
+++ b/HtmlRenderer/test/test.pro
@ -12,8 +12,6 @@ TARGET = test
 CONFIG   += console
 CONFIG   -= app_bundle

-CONFIG += c++11
-
 DEFINES += PDFREADER_USE_DYNAMIC_LIBRARY
 DEFINES += PDFWRITER_USE_DYNAMIC_LIBRARY
 DEFINES += XPS_USE_DYNAMIC_LIBRARY
--- a/OfficeCryptReader/Test/test.pro
+++ b/OfficeCryptReader/Test/test.pro
@ -7,7 +7,6 @@ TARGET = test
 CORE_ROOT_DIR = $$PWD/../..
 PWD_ROOT_DIR = $$PWD

-CONFIG += core_static_link_libstd
 include($$CORE_ROOT_DIR/Common/base.pri)
 include($$CORE_ROOT_DIR/Common/3dParty/boost/boost.pri)

@ -54,5 +53,4 @@ core_windows {

 core_linux {
    LIBS += -lz -pthread -ldl
-    QMAKE_LFLAGS += -Wl,--rpath=./
 }
--- a/OfficeCryptReader/ooxml_crypt/ooxml_crypt.pro
+++ b/OfficeCryptReader/ooxml_crypt/ooxml_crypt.pro
@ -7,7 +7,6 @@ TARGET = ooxml_crypt
 CORE_ROOT_DIR = $$PWD/../..
 PWD_ROOT_DIR = $$PWD

-CONFIG += core_static_link_libstd
 include($$CORE_ROOT_DIR/Common/base.pri)
 include($$CORE_ROOT_DIR/Common/3dParty/boost/boost.pri)

@ -55,5 +54,4 @@ core_windows {

 core_linux {
    LIBS += -lz -pthread -ldl
-    QMAKE_LFLAGS += -Wl,--rpath=./
 }
--- a/PdfFile/PdfFile.pro
+++ b/PdfFile/PdfFile.pro
@ -7,7 +7,6 @@ TEMPLATE = lib

 CONFIG += shared
 CONFIG += plugin
-CONFIG += core_static_link_libstd

 CORE_ROOT_DIR = $$PWD/..
 PWD_ROOT_DIR = $$PWD
--- a/Test/Applications/TestDownloader/downloader.pro
+++ b/Test/Applications/TestDownloader/downloader.pro
@ -2,7 +2,6 @@ QT += core gui

 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets

-CONFIG += c++11
 #CONFIG += console

 CORE_ROOT_DIR = $$PWD/../../../../core
--- a/UnicodeConverter/UnicodeConverter.pro
+++ b/UnicodeConverter/UnicodeConverter.pro
@ -6,7 +6,6 @@ TEMPLATE = lib

 CONFIG += shared
 CONFIG += plugin
-CONFIG += core_static_link_libstd

 CORE_ROOT_DIR = $$PWD/..
 PWD_ROOT_DIR = $$PWD
--- a/UnicodeConverter/test/test.pro
+++ b/UnicodeConverter/test/test.pro
@ -1,57 +1,17 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2015-07-21T18:28:42
-#
-#-------------------------------------------------
-
 QT       -= core
 QT       -= gui

 TARGET = test
 CONFIG   += console
 CONFIG   -= app_bundle
-
-DEFINES += UNICODECONVERTER_USE_DYNAMIC_LIBRARY
-CONFIG -= debug_and_release debug_and_release_target
-
-CONFIG += c++11
 TEMPLATE = app

-QMAKE_LFLAGS += -Wl,--rpath=./
+DEFINES += UNICODECONVERTER_USE_DYNAMIC_LIBRARY

-############### destination path ###############
-DESTINATION_SDK_PATH = $$PWD/../../SDK/lib
+CORE_ROOT_DIR = $$PWD/../..
+PWD_ROOT_DIR = $$PWD
+include(../../Common/base.pri)

-# WINDOWS
-win32:contains(QMAKE_TARGET.arch, x86_64):{
-CONFIG(debug, debug|release) {
-    DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/win_64/DEBUG
-} else {
-    DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/win_64
-}
-}
-win32:!contains(QMAKE_TARGET.arch, x86_64):{
-CONFIG(debug, debug|release) {
-    DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/win_32/DEBUG
-} else {
-    DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/win_32
-}
-}
+ADD_DEPENDENCY(kernel, UnicodeConverter)

-linux-g++:contains(QMAKE_HOST.arch, x86_64):{
-    DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/linux_64
-    #LIBS += -L$$PWD/../icubuilds/linux64/usr/local/lib -licuuc -licudata
-    LIBS        += $$PWD/../icubuilds/linux64/usr/local/lib/libicuuc.so.55
-    LIBS        += $$PWD/../icubuilds/linux64/usr/local/lib/libicudata.so.55
-}
-linux-g++:!contains(QMAKE_HOST.arch, x86_64):{
-    DESTINATION_SDK_PATH = $$DESTINATION_SDK_PATH/linux_32
-}
-
-LIBS += -L$$DESTINATION_SDK_PATH -lUnicodeConverter
-
-SOURCES += main.cpp
-
-unix {
-    LD_LIBRARY_PATH = ./
-}
+SOURCES += main.cpp
--- a/X2tConverter/build/Qt/X2tConverter.pri
+++ b/X2tConverter/build/Qt/X2tConverter.pri
@ -11,7 +11,6 @@ TARGET = x2t
 CORE_ROOT_DIR = $$PWD/../../..
 PWD_ROOT_DIR = $$PWD

-CONFIG += core_static_link_libstd
 CONFIG += core_x2t
 include(../../../Common/base.pri)
 include(../../../Common/3dParty/icu/icu.pri)
--- a/X2tConverter/build/Qt/X2tConverter.pro
+++ b/X2tConverter/build/Qt/X2tConverter.pro
@ -19,8 +19,6 @@ build_x2t_as_library {

    CONFIG += shared
    CONFIG += plugin
-
-    CONFIG += core_static_link_libstd
 }

 include(X2tConverter.pri)
--- a/X2tConverter/test/batch_convert/x2t_test/x2t_test.pro
+++ b/X2tConverter/test/batch_convert/x2t_test/x2t_test.pro
@ -11,8 +11,6 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 TARGET = x2t_test
 TEMPLATE = app

-CONFIG += c++11
-
 CORE_ROOT_DIR = $$PWD/../../../../../core
 PWD_ROOT_DIR = $$PWD
 include($$CORE_ROOT_DIR/Common/base.pri)
--- a/XpsFile/XpsFile.pro
+++ b/XpsFile/XpsFile.pro
@ -7,8 +7,6 @@ TEMPLATE = lib
 CONFIG += shared
 CONFIG += plugin

-CONFIG += core_static_link_libstd
-
 CORE_ROOT_DIR = $$PWD/..
 PWD_ROOT_DIR = $$PWD
 include(../Common/base.pri)