From f0252a1f4993c1953e3a116558e94ebd226b7ffa Mon Sep 17 00:00:00 2001 From: eelke Date: Sun, 18 Oct 2026 07:05:03 +0200 Subject: [PATCH] Remove old qmake project files. --- common.pri | 15 -- core/core.pro | 43 ----- local.pri.sample | 17 -- pglab/pglab.pro | 229 -------------------------- pglabAll.pro | 18 -- pglablib/pglablib.pro | 222 ------------------------- pgsql/pgsql.pro | 60 ------- tests/PgsqlTests/PgsqlTests.pro | 46 ------ tests/PgsqlTests/gtest_dependency.pri | 29 ---- tests/mygtestutils/mygtestutils.pro | 32 ---- tests/pglabtests/pglabtests.pro | 86 ---------- tests/tests.pro | 5 - 12 files changed, 802 deletions(-) delete mode 100644 common.pri delete mode 100644 core/core.pro delete mode 100644 local.pri.sample delete mode 100644 pglab/pglab.pro delete mode 100644 pglabAll.pro delete mode 100644 pglablib/pglablib.pro delete mode 100644 pgsql/pgsql.pro delete mode 100644 tests/PgsqlTests/PgsqlTests.pro delete mode 100644 tests/PgsqlTests/gtest_dependency.pri delete mode 100644 tests/mygtestutils/mygtestutils.pro delete mode 100644 tests/pglabtests/pglabtests.pro delete mode 100644 tests/tests.pro diff --git a/common.pri b/common.pri deleted file mode 100644 index dcff145..0000000 --- a/common.pri +++ /dev/null @@ -1,15 +0,0 @@ -! include( ./local.pri ) { -error( "Use local.pri.sample to create your own local.pri" ) -} - -LIBS += -lUser32 -lws2_32 -llibpq - -CONFIG += c++20 - -# The following define makes your compiler emit warnings if you use -# any feature of Qt which as been marked as deprecated (the exact warnings -# depend on your compiler). Please consult the documentation of the -# deprecated API in order to know how to port your code away from it. -DEFINES += QT_DEPRECATED_WARNINGS -DEFINES += BOOST_ENABLE_ASSERT_HANDLER -DEFINES += WIN32_LEAN_AND_MEAN NOMINMAX _WIN32_WINNT=0x0501 diff --git a/core/core.pro b/core/core.pro deleted file mode 100644 index 0b424f6..0000000 --- a/core/core.pro +++ /dev/null @@ -1,43 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2017-02-26T10:51:14 -# -#------------------------------------------------- - -QT -= gui - -TARGET = core -TEMPLATE = lib -CONFIG += staticlib - -! include( ../common.pri ) { -error( "Couldn't find the common.pri file!" ) -} - -# You can also make your code fail to compile if you use deprecated APIs. -# In order to do so, uncomment the following line. -# You can also select to disable deprecated APIs only up to a certain version of Qt. -#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 - -SOURCES += my_boost_assert_handler.cpp \ - SqlLexer.cpp \ - CsvWriter.cpp \ - BackupFormatModel.cpp \ - ExplainTreeModelItem.cpp \ - jsoncpp.cpp - -HEADERS += \ - SqlLexer.h \ - ScopeGuard.h \ - CsvWriter.h \ - BackupFormatModel.h \ - Expected.h \ - ExplainTreeModelItem.h \ - json/json.h \ - std_utils.h \ - IntegerRange.h - -unix { - target.path = /usr/lib - INSTALLS += target -} diff --git a/local.pri.sample b/local.pri.sample deleted file mode 100644 index 44b8f1e..0000000 --- a/local.pri.sample +++ /dev/null @@ -1,17 +0,0 @@ -# Need paths here to find following library headers -# - botan -# - boost -# - libpq -# ??? -INCLUDEPATH += c:/prog/include -INCLUDEPATH += c:/prog/include/pgsql -INCLUDEPATH += c:/VSproj/boost/include/boost-1_68 - -# Need paths here to find library files for -# - botan -# - boost -# - libpq -# -LIBS += -L\VSproj\boost\lib -L/PROG/LIB - -GOOGLETEST_DIR = c:/prog/googletest diff --git a/pglab/pglab.pro b/pglab/pglab.pro deleted file mode 100644 index 93a9186..0000000 --- a/pglab/pglab.pro +++ /dev/null @@ -1,229 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2016-11-11T09:17:13 -# -#------------------------------------------------- - -QT += core gui concurrent - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets sql - - -TARGET = pglab -TEMPLATE = app - -! include( ../common.pri ) { -error( "Couldn't find the common.pri file!" ) -} - -DEFINES += _WIN32_WINNT=0x0501 - -win32:RC_ICONS += pglab.ico - -SOURCES += main.cpp\ - About.cpp \ - catalog/delegates/IconColumnDelegate.cpp \ - catalog/models/BaseTableModel.cpp \ - catalog/models/ColumnTableModel.cpp \ - catalog/models/ConstraintModel.cpp \ - catalog/models/DatabasesTableModel.cpp \ - catalog/models/DependantsTableModel.cpp \ - catalog/models/IndexModel.cpp \ - catalog/models/ProcTableModel.cpp \ - catalog/models/RolesTableModel.cpp \ - catalog/models/SequenceModel.cpp \ - catalog/models/TriggerTableModel.cpp \ - catalog/tables/TablesTableModel.cpp \ - catalog/widgets/CatalogConstraintPage.cpp \ - catalog/widgets/CatalogFunctionsPage.cpp \ - catalog/widgets/CatalogIndexPage.cpp \ - catalog/widgets/CatalogInspector.cpp \ - catalog/widgets/CatalogNamespacePage.cpp \ - catalog/widgets/CatalogPageBase.cpp \ - catalog/widgets/CatalogSequencesPage.cpp \ - catalog/widgets/CatalogTablesPage.cpp \ - catalog/widgets/CatalogTypesPage.cpp \ - catalog/widgets/ColumnPage.cpp \ - catalog/widgets/DependantsPage.cpp \ - catalog/widgets/TriggerPage.cpp \ - codeeditor/CodeEditor.cpp \ - codeeditor/EditorGutter.cpp \ - codeeditor/GutterPainter.cpp \ - crud/CrudModel.cpp \ - crud/CrudTab.cpp \ - querytool/QueryExplainModel.cpp \ - querytool/QueryParamListController.cpp \ - querytool/QueryResultModel.cpp \ - querytool/QueryTool.cpp \ - serverinspector/DatabasesPage.cpp \ - serverinspector/RolesPage.cpp \ - serverinspector/ServerInspector.cpp \ - util/Colors.cpp \ - util/PgLabItemDelegate.cpp \ - util/PgLabTableView.cpp \ - util/SqlSyntaxHighlighter.cpp \ - ConnectionConfigurationWidget.cpp \ - ConnectionController.cpp \ - ManagedPage.cpp \ - PgDumpOutputHighlighter.cpp \ - CreateDatabaseDialog.cpp \ - ConnectionManagerWindow.cpp \ - ConnectionListModel.cpp \ - SslModeModel.cpp \ - stopwatch.cpp \ - TuplesResultWidget.cpp \ - BackupDialog.cpp \ - MasterController.cpp \ - ParamTypeDelegate.cpp \ - OpenDatabase.cpp \ - ProcessStdioWidget.cpp \ - ResultTableModelUtil.cpp \ - NamespaceItemModel.cpp \ - PropertyProxyModel.cpp \ - CodeGenerator.cpp \ - UserConfiguration.cpp \ - widgets/SqlCodePreview.cpp \ - CustomFilterSortModel.cpp \ - PropertiesPage.cpp \ - PasswordPromptDialog.cpp \ - EditTableWidget.cpp \ - EditColumnTableModel.cpp \ - DatabaseWindow.cpp \ - widgets/SingleRecordModel.cpp \ - widgets/SingleRecordWidget.cpp - -HEADERS += \ - About.h \ - Config.h \ - catalog/delegates/IconColumnDelegate.h \ - catalog/models/BaseTableModel.h \ - catalog/models/ColumnTableModel.h \ - catalog/models/ConstraintModel.h \ - catalog/models/DatabasesTableModel.h \ - catalog/models/DependantsTableModel.h \ - catalog/models/IndexModel.h \ - catalog/models/ProcTableModel.h \ - catalog/models/RolesTableModel.h \ - catalog/models/SequenceModel.h \ - catalog/models/TriggerTableModel.h \ - catalog/tables/TablesTableModel.h \ - catalog/widgets/CatalogConstraintPage.h \ - catalog/widgets/CatalogFunctionsPage.h \ - catalog/widgets/CatalogIndexPage.h \ - catalog/widgets/CatalogInspector.h \ - catalog/widgets/CatalogNamespacePage.h \ - catalog/widgets/CatalogPageBase.h \ - catalog/widgets/CatalogSequencesPage.h \ - catalog/widgets/CatalogTablesPage.h \ - catalog/widgets/CatalogTypesPage.h \ - catalog/widgets/ColumnPage.h \ - catalog/widgets/DependantsPage.h \ - catalog/widgets/TriggerPage.h \ - codeeditor/CodeEditor.h \ - codeeditor/EditorGutter.h \ - codeeditor/GutterPainter.h \ - crud/CrudModel.h \ - crud/CrudTab.h \ - querytool/QueryExplainModel.h \ - querytool/QueryParamListController.h \ - querytool/QueryResultModel.h \ - querytool/QueryTool.h \ - serverinspector/DatabasesPage.h \ - serverinspector/RolesPage.h \ - serverinspector/ServerInspector.h \ - util/Colors.h \ - util/PgLabItemDelegate.h \ - util/PgLabTableView.h \ - util/PgLabTableViewHelper.h \ - util/SqlSyntaxHighlighter.h \ - ConnectionConfigurationWidget.h \ - ConnectionController.h \ - IDatabaseWindow.h \ - ManagedPage.h \ - PgDumpOutputHighlighter.h \ - CreateDatabaseDialog.h \ - ConnectionManagerWindow.h \ - ConnectionListModel.h \ - SslModeModel.h \ - stopwatch.h \ - TuplesResultWidget.h \ - BackupDialog.h \ - MasterController.h \ - ParamTypeDelegate.h \ - OpenDatabase.h \ - ProcessStdioWidget.h \ - ResultTableModelUtil.h \ - NamespaceItemModel.h \ - AbstractCommand.h \ - PropertyProxyModel.h \ - CustomDataRole.h \ - CodeGenerator.h \ - UserConfiguration.h \ - widgets/SqlCodePreview.h \ - CustomFilterSortModel.h \ - PropertiesPage.h \ - PasswordPromptDialog.h \ - EditTableWidget.h \ - EditColumnTableModel.h \ - DatabaseWindow.h \ - NamespaceFilter.h \ - widgets/SingleRecordModel.h \ - widgets/SingleRecordWidget.h - -FORMS += \ - ConnectionManagerWindow.ui \ - CreateDatabaseDialog.ui \ - DatabaseWindow.ui \ - TuplesResultWidget.ui \ - querytool/QueryTab.ui \ - ProcessStdioWidget.ui \ - crud/CrudTab.ui \ - CodeGenerator.ui \ - widgets/SingleRecordWidget.ui - -RESOURCES += \ - resources.qrc - -#QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS,5.01 - -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../core/release/ -lcore -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../core/debug/ -lcore - -INCLUDEPATH += $$PWD/../core -DEPENDPATH += $$PWD/../core - -win32:CONFIG(debug, debug|release): LIBS += -lbotand -else:win32:CONFIG(release, debug|release): LIBS += -lbotan - -win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/release/libcore.a -else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/debug/libcore.a -else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/release/core.lib -else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/debug/core.lib - - -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../pgsql/release/ -lpgsql -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../pgsql/debug/ -lpgsql -else:unix:!macx: LIBS += -L$$OUT_PWD/../pgsql/ -lpgsql - -INCLUDEPATH += $$PWD/../pgsql -DEPENDPATH += $$PWD/../pgsql - -win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../pgsql/release/libpgsql.a -else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../pgsql/debug/libpgsql.a -else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../pgsql/release/pgsql.lib -else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../pgsql/debug/pgsql.lib -else:unix:!macx: PRE_TARGETDEPS += $$OUT_PWD/../pgsql/libpgsql.a - - -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../pglablib/release/ -lpglablib -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../pglablib/debug/ -lpglablib -else:unix:!macx: LIBS += -L$$OUT_PWD/../pglablib/ -lpglablib - -INCLUDEPATH += $$PWD/../pglablib -DEPENDPATH += $$PWD/../pglablib - -win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../pglablib/release/libpglablib.a -else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../pglablib/debug/libpglablib.a -else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../pglablib/release/pglablib.lib -else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../pglablib/debug/pglablib.lib -else:unix:!macx: PRE_TARGETDEPS += $$OUT_PWD/../pglablib/libpglablib.a diff --git a/pglabAll.pro b/pglabAll.pro deleted file mode 100644 index 8631a5e..0000000 --- a/pglabAll.pro +++ /dev/null @@ -1,18 +0,0 @@ -TEMPLATE = subdirs - -DEFINES += BOOST_ENABLE_ASSERT_HANDLER - -SUBDIRS += core \ - pgsql \ - pglablib \ - pglab - -pglab.depends = core pgsql pglablib -pgsql.depends = core -pglablib.depends = core pgsql -tests.depends = core pgsql pglablib - - -CONFIG(debug, debug|release) { -SUBDIRS += tests -} diff --git a/pglablib/pglablib.pro b/pglablib/pglablib.pro deleted file mode 100644 index c41f973..0000000 --- a/pglablib/pglablib.pro +++ /dev/null @@ -1,222 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2017-12-13T17:36:43 -# -#------------------------------------------------- - -QT += widgets core - -TARGET = pglablib -TEMPLATE = lib -CONFIG += staticlib - -! include( ../common.pri ) { -error( "Couldn't find the common.pri file!" ) -} - -# You can also make your code fail to compile if you use deprecated APIs. -# In order to do so, uncomment the following line. -# You can also select to disable deprecated APIs only up to a certain version of Qt. -#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 - -SOURCES += \ - Pglablib.cpp \ - ASyncDBConnection.cpp \ - ConnectionConfig.cpp \ - TestConnection.cpp \ - WaitHandleList.cpp \ - catalog/PgType.cpp \ - catalog/PgTypeContainer.cpp \ - catalog/PgNamespace.cpp \ - catalog/PgClass.cpp \ - catalog/PgDatabase.cpp \ - catalog/PgDatabaseContainer.cpp \ - catalog/PgAuthId.cpp \ - catalog/PgAuthIdContainer.cpp \ - catalog/PgClassContainer.cpp \ - catalog/PgDatabaseCatalog.cpp \ - catalog/PgNamespaceContainer.cpp \ - catalog/PgAttribute.cpp \ - catalog/PgContainer.cpp \ - catalog/PgAttributeContainer.cpp \ - catalog/PgIndex.cpp \ - catalog/PgIndexContainer.cpp \ - catalog/PgConstraint.cpp \ - catalog/PgConstraintContainer.cpp \ - ParamListJson.cpp \ - ParamListModel.cpp \ - sqlite/SQLiteConnection.cpp \ - sqlite/sqlite3.c \ - ui/catalog/tables/TableNode.cpp \ - ui/catalog/tables/TableSize.cpp \ - ui/catalog/tables/TableTreeBuilder.cpp \ - util.cpp \ - SqlFormattingUtils.cpp \ - catalog/PgKeywordList.cpp \ - QueryGenerator.cpp \ - catalog/PgObject.cpp \ - catalog/PgTablespace.cpp \ - catalog/PgTablespaceContainer.cpp \ - codebuilder/LanguageConfig.cpp \ - codebuilder/CodeBuilder.cpp \ - codebuilder/NameManglingRules.cpp \ - codebuilder/DefaultConfigs.cpp \ - codebuilder/TypeMappings.cpp \ - codebuilder/IndentationConfig.cpp \ - codebuilder/StructureTemplate.cpp \ - FormatToStream.cpp \ - codebuilder/StringLiteralRules.cpp \ - codebuilder/StringEscapeRule.cpp \ - catalog/PgTrigger.cpp \ - catalog/PgTriggerContainer.cpp \ - catalog/PgProc.cpp \ - catalog/PgProcContainer.cpp \ - catalog/PgDatabaseObject.cpp \ - catalog/PgServerObject.cpp \ - catalog/PgNamespaceObject.cpp \ - catalog/PgCollation.cpp \ - catalog/PgCollationContainer.cpp \ - catalog/PgInherits.cpp \ - catalog/PgInheritsContainer.cpp \ - SelectionEditorFactory.cpp \ - catalog/PgAm.cpp \ - model/TypeModelFactory.cpp \ - model/TypeSelectionItemModel.cpp \ - catalog/PgAmContainer.cpp \ - model/CollationModel.cpp \ - model/CollationModelFactory.cpp \ - catalog/PgLanguageContainer.cpp \ - catalog/PgLanguage.cpp \ - catalog/PgAcl.cpp \ - catalog/PgSequence.cpp \ - catalog/PgSequenceContainer.cpp \ - utils/HumanReadableBytes.cpp \ - utils/KeyStrengthener.cpp \ - utils/PasswordManager.cpp \ - utils/PostgresqlUrlParser.cpp - -HEADERS += \ - Pglablib.h \ - ASyncDBConnection.h \ - ConnectionConfig.h \ - TestConnection.h \ - WaitHandleList.h \ - Win32Event.h \ - catalog/PgType.h \ - catalog/PgTypeContainer.h \ - catalog/PgNamespace.h \ - catalog/PgClass.h \ - catalog/PgDatabase.h \ - catalog/PgDatabaseContainer.h \ - catalog/PgContainer.h \ - catalog/PgAuthId.h \ - catalog/PgAuthIdContainer.h \ - catalog/PgClassContainer.h \ - catalog/PgDatabaseCatalog.h \ - catalog/PgNamespaceContainer.h \ - catalog/PgAttribute.h \ - catalog/PgAttributeContainer.h \ - catalog/PgIndex.h \ - catalog/PgIndexContainer.h \ - catalog/PgConstraint.h \ - catalog/PgConstraintContainer.h \ - ParamListJson.h \ - ParamListModel.h \ - sqlite/SQLiteConnection.h \ - sqlite/sqlite3.h \ - sqlite/sqlite3ext.h \ - ui/catalog/tables/TableNode.h \ - ui/catalog/tables/TableSize.h \ - ui/catalog/tables/TableTreeBuilder.h \ - util.h \ - SqlFormattingUtils.h \ - catalog/PgCatalogTypes.h \ - catalog/PgKeywordList.h \ - QueryGenerator.h \ - catalog/PgObject.h \ - catalog/PgTablespace.h \ - catalog/PgTablespaceContainer.h \ - codebuilder/LanguageConfig.h \ - codebuilder/CodeBuilder.h \ - codebuilder/NameManglingRules.h \ - codebuilder/DefaultConfigs.h \ - codebuilder/TypeMappings.h \ - codebuilder/IndentationConfig.h \ - codebuilder/StructureTemplate.h \ - FormatToStream.h \ - codebuilder/ResultLoopTemplate.h \ - codebuilder/StringEscapeRule.h \ - codebuilder/StringLiteralRules.h \ - catalog/PgTrigger.h \ - catalog/PgTriggerContainer.h \ - catalog/PgProc.h \ - catalog/PgProcContainer.h \ - catalog/PgDatabaseObject.h \ - catalog/PgServerObject.h \ - catalog/PgNamespaceObject.h \ - catalog/PgCollation.h \ - catalog/PgCollationContainer.h \ - AbstractModelFactory.h \ - AbstractEditorFactory.h \ - catalog/PgInherits.h \ - catalog/PgInheritsContainer.h \ - SelectionEditorFactory.h \ - model/TypeSelectionItemModel.h \ - model/TypeModelFactory.h \ - catalog/PgAm.h \ - catalog/PgAmContainer.h \ - model/CollationModel.h \ - model/CollationModelFactory.h \ - catalog/PgLanguageContainer.h \ - catalog/PgLanguage.h \ - catalog/PgAcl.h \ - catalog/PgSequence.h \ - catalog/PgSequenceContainer.h \ - utils/HumanReadableBytes.h \ - utils/KeyStrengthener.h \ - utils/PasswordManager.h \ - utils/PostgresqlUrlParser.h - -unix { - target.path = /usr/lib - INSTALLS += target -} - -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../core/release/ -lcore -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../core/debug/ -lcore -else:unix:!macx: LIBS += -L$$OUT_PWD/../core/ -lcore - -INCLUDEPATH += $$PWD/../core -DEPENDPATH += $$PWD/../core - -win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/release/libcore.a -else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/debug/libcore.a -else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/release/core.lib -else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/debug/core.lib -else:unix:!macx: PRE_TARGETDEPS += $$OUT_PWD/../core/libcore.a - -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../pgsql/release/ -lpgsql -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../pgsql/debug/ -lpgsql -else:unix:!macx: LIBS += -L$$OUT_PWD/../pgsql/ -lpgsql - -INCLUDEPATH += $$PWD/../pgsql -DEPENDPATH += $$PWD/../pgsql - -win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../pgsql/release/libpgsql.a -else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../pgsql/debug/libpgsql.a -else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../pgsql/release/pgsql.lib -else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../pgsql/debug/pgsql.lib -else:unix:!macx: PRE_TARGETDEPS += $$OUT_PWD/../pgsql/libpgsql.a - -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../core/release/ -lcore -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../core/debug/ -lcore -else:unix: LIBS += -L$$OUT_PWD/../core/ -lcore - -INCLUDEPATH += $$PWD/../core -DEPENDPATH += $$PWD/../core - -win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/release/libcore.a -else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/debug/libcore.a -else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/release/core.lib -else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/debug/core.lib -else:unix: PRE_TARGETDEPS += $$OUT_PWD/../core/libcore.a diff --git a/pgsql/pgsql.pro b/pgsql/pgsql.pro deleted file mode 100644 index 02c21a5..0000000 --- a/pgsql/pgsql.pro +++ /dev/null @@ -1,60 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2016-11-11T09:17:13 -# -#------------------------------------------------- - -CONFIG += staticlib -QT += core - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets - -TARGET = pgsql -TEMPLATE = lib - -! include( ../common.pri ) { -error( "Couldn't find the common.pri file!" ) -} - -LIBS += -lws2_32 -llibpq - -SOURCES += Pgsql_Connection.cpp \ - Pgsql_Params.cpp \ - Pgsql_PgException.cpp \ - Pgsql_Result.cpp \ - Pgsql_Row.cpp \ - Pgsql_Value.cpp \ - ArrayParser.cpp \ - Pgsql_oids.cpp \ - Pgsql_Transaction.cpp \ - Pgsql_ErrorDetails.cpp \ - Pgsql_Canceller.cpp - -HEADERS += Pgsql_Connection.h \ - Pgsql_IResult.h \ - Pgsql_Params.h \ - Pgsql_PgException.h \ - Pgsql_Result.h \ - Pgsql_ResultConstIterator.h \ - Pgsql_Row.h \ - Pgsql_Value.h \ - Pgsql_declare.h \ - Pgsql_Col.h \ - ArrayParser.h \ - Pgsql_oids.h \ - SqlGenerator.h \ - Pgsql_Transaction.h \ - Pgsql_ErrorDetails.h \ - Pgsql_Canceller.h - - -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../core/release/ -lcore -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../core/debug/ -lcore - -INCLUDEPATH += $$PWD/../core -DEPENDPATH += $$PWD/../core - -win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/release/libcore.a -else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/debug/libcore.a -else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/release/core.lib -else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/debug/core.lib diff --git a/tests/PgsqlTests/PgsqlTests.pro b/tests/PgsqlTests/PgsqlTests.pro deleted file mode 100644 index cb1d574..0000000 --- a/tests/PgsqlTests/PgsqlTests.pro +++ /dev/null @@ -1,46 +0,0 @@ -! include( ../../common.pri ) { -error( "Couldn't find the common.pri file!" ) -} -include(gtest_dependency.pri) - -TEMPLATE = app -CONFIG += console -CONFIG -= app_bundle -CONFIG += thread -CONFIG += qt - -QT += core - -HEADERS += - -SOURCES += main.cpp \ - tst_Value.cpp \ - tst_ArrayParser.cpp \ - tst_Pgsql_oids.cpp - - -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../pgsql/release/ -lpgsql -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../pgsql/debug/ -lpgsql -else:unix: LIBS += -L$$OUT_PWD/../../pgsql/ -lpgsql - -INCLUDEPATH += $$PWD/../../pgsql -DEPENDPATH += $$PWD/../../pgsql - -win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../pgsql/release/libpgsql.a -else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../pgsql/debug/libpgsql.a -else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../pgsql/release/pgsql.lib -else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../pgsql/debug/pgsql.lib -else:unix: PRE_TARGETDEPS += $$OUT_PWD/../../pgsql/libpgsql.a - -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../mygtestutils/release/ -lmygtestutils -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../mygtestutils/debug/ -lmygtestutils -else:unix:!macx: LIBS += -L$$OUT_PWD/../mygtestutils/ -lmygtestutils - -INCLUDEPATH += $$PWD/../mygtestutils -DEPENDPATH += $$PWD/../mygtestutils - -win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../mygtestutils/release/libmygtestutils.a -else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../mygtestutils/debug/libmygtestutils.a -else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../mygtestutils/release/mygtestutils.lib -else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../mygtestutils/debug/mygtestutils.lib -else:unix:!macx: PRE_TARGETDEPS += $$OUT_PWD/../mygtestutils/libmygtestutils.a diff --git a/tests/PgsqlTests/gtest_dependency.pri b/tests/PgsqlTests/gtest_dependency.pri deleted file mode 100644 index d01d7f0..0000000 --- a/tests/PgsqlTests/gtest_dependency.pri +++ /dev/null @@ -1,29 +0,0 @@ -isEmpty(GOOGLETEST_DIR):GOOGLETEST_DIR=$$(GOOGLETEST_DIR) - -isEmpty(GOOGLETEST_DIR) { - warning("Using googletest src dir specified at Qt Creator wizard") - message("set GOOGLETEST_DIR as environment variable or qmake variable to get rid of this message") - GOOGLETEST_DIR = C:/Prog/googletest -} - -!isEmpty(GOOGLETEST_DIR): { - GTEST_SRCDIR = $$GOOGLETEST_DIR/googletest - GMOCK_SRCDIR = $$GOOGLETEST_DIR/googlemock -} - -requires(exists($$GTEST_SRCDIR):exists($$GMOCK_SRCDIR)) - -!exists($$GOOGLETEST_DIR):message("No googletest src dir found - set GOOGLETEST_DIR to enable.") - -DEFINES += \ - GTEST_LANG_CXX11 - -INCLUDEPATH *= \ - $$GTEST_SRCDIR \ - $$GTEST_SRCDIR/include \ - $$GMOCK_SRCDIR \ - $$GMOCK_SRCDIR/include - -SOURCES += \ - $$GTEST_SRCDIR/src/gtest-all.cc \ - $$GMOCK_SRCDIR/src/gmock-all.cc diff --git a/tests/mygtestutils/mygtestutils.pro b/tests/mygtestutils/mygtestutils.pro deleted file mode 100644 index a56a359..0000000 --- a/tests/mygtestutils/mygtestutils.pro +++ /dev/null @@ -1,32 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2017-12-01T10:07:31 -# -#------------------------------------------------- - -QT -= gui - -TARGET = mygtestutils -TEMPLATE = lib -CONFIG += staticlib - -# The following define makes your compiler emit warnings if you use -# any feature of Qt which has been marked as deprecated (the exact warnings -# depend on your compiler). Please consult the documentation of the -# deprecated API in order to know how to port your code away from it. -DEFINES += QT_DEPRECATED_WARNINGS - -# You can also make your code fail to compile if you use deprecated APIs. -# In order to do so, uncomment the following line. -# You can also select to disable deprecated APIs only up to a certain version of Qt. -#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 - -SOURCES += \ - PrintTo_Qt.cpp - -HEADERS += \ - PrintTo_Qt.h -unix { - target.path = /usr/lib - INSTALLS += target -} diff --git a/tests/pglabtests/pglabtests.pro b/tests/pglabtests/pglabtests.pro deleted file mode 100644 index a666430..0000000 --- a/tests/pglabtests/pglabtests.pro +++ /dev/null @@ -1,86 +0,0 @@ -! include( ../../common.pri ) { -error( "Couldn't find the common.pri file!" ) -} -include(gtest_dependency.pri) - -TEMPLATE = app -CONFIG += console -CONFIG -= app_bundle -CONFIG += thread -CONFIG += qt - -QT += core widgets - -HEADERS += - -SOURCES += main.cpp \ - TableTreeBuilderTests.cpp \ - tst_ConvertLangToSqlString.cpp \ - tst_ConvertToMultiLineCString.cpp \ - tst_ExplainJsonParser.cpp \ - tst_HumanReadableBytes.cpp \ - tst_TryParsePostgresqlUrl.cpp \ - tst_escapeConnectionStringValue.cpp \ - tst_expected.cpp \ - tst_SqlLexer.cpp \ - tst_scopeguard.cpp \ - tst_CsvWriter.cpp \ - tst_PasswordManager.cpp \ - tst_ParamJson.cpp \ - tst_CodeBuilder.cpp \ - tst_NameManglingRules.cpp \ - tst_TypeMappings.cpp \ - tst_Range.cpp - -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../core/release/ -lcore -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../core/debug/ -lcore - -INCLUDEPATH += $$PWD/../../core -DEPENDPATH += $$PWD/../../core - -win32:CONFIG(debug, debug|release): LIBS += -lbotand -else:win32:CONFIG(release, debug|release): LIBS += -lbotan - -win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../core/release/libcore.a -else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../core/debug/libcore.a -else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../core/release/core.lib -else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../core/debug/core.lib - -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../pgsql/release/ -lpgsql -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../pgsql/debug/ -lpgsql -else:unix:!macx: LIBS += -L$$OUT_PWD/../../pgsql/ -lpgsql - -INCLUDEPATH += $$PWD/../../pgsql -DEPENDPATH += $$PWD/../../pgsql - -win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../pgsql/release/libpgsql.a -else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../pgsql/debug/libpgsql.a -else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../pgsql/release/pgsql.lib -else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../pgsql/debug/pgsql.lib -else:unix:!macx: PRE_TARGETDEPS += $$OUT_PWD/../../pgsql/libpgsql.a - -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../pglablib/release/ -lpglablib -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../pglablib/debug/ -lpglablib -else:unix:!macx: LIBS += -L$$OUT_PWD/../../pglablib/ -lpglablib - -INCLUDEPATH += $$PWD/../../pglablib -DEPENDPATH += $$PWD/../../pglablib - -win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../pglablib/release/libpglablib.a -else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../pglablib/debug/libpglablib.a -else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../pglablib/release/pglablib.lib -else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../pglablib/debug/pglablib.lib -else:unix:!macx: PRE_TARGETDEPS += $$OUT_PWD/../../pglablib/libpglablib.a - -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../mygtestutils/release/ -lmygtestutils -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../mygtestutils/debug/ -lmygtestutils -else:unix:!macx: LIBS += -L$$OUT_PWD/../mygtestutils/ -lmygtestutils - -INCLUDEPATH += $$PWD/../mygtestutils -DEPENDPATH += $$PWD/../mygtestutils - -win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../mygtestutils/release/libmygtestutils.a -else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../mygtestutils/debug/libmygtestutils.a -else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../mygtestutils/release/mygtestutils.lib -else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../mygtestutils/debug/mygtestutils.lib -else:unix:!macx: PRE_TARGETDEPS += $$OUT_PWD/../mygtestutils/libmygtestutils.a diff --git a/tests/tests.pro b/tests/tests.pro deleted file mode 100644 index ee23c08..0000000 --- a/tests/tests.pro +++ /dev/null @@ -1,5 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += PgsqlTests \ - pglabtests \ - mygtestutils