Refactoring

This commit is contained in:
Oleg Korshul
2021-03-09 16:37:30 +03:00
parent e1d7bf74ba
commit 57cf4311a0
13 changed files with 6 additions and 1757 deletions

View File

@ -1,73 +0,0 @@
# This file is used to ignore files which are generated
# ----------------------------------------------------------------------------
*~
*.autosave
*.a
*.core
*.moc
*.o
*.obj
*.orig
*.rej
*.so
*.so.*
*_pch.h.cpp
*_resource.rc
*.qm
.#*
*.*#
core
!core/
tags
.DS_Store
.directory
*.debug
Makefile*
*.prl
*.app
moc_*.cpp
ui_*.h
qrc_*.cpp
Thumbs.db
*.res
*.rc
/.qmake.cache
/.qmake.stash
# qtcreator generated files
*.pro.user*
# xemacs temporary files
*.flc
# Vim temporary files
.*.swp
# Visual Studio generated files
*.ib_pdb_index
*.idb
*.ilk
*.pdb
*.sln
*.suo
*.vcproj
*vcproj.*.*.user
*.ncb
*.sdf
*.opensdf
*.vcxproj
*vcxproj.*
# MinGW generated files
*.Debug
*.Release
# Python byte code
*.pyc
# Binaries
# --------
*.dll
*.exe

View File

@ -1,12 +1,4 @@
QT += core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
CONFIG += c++11
# You can make your code fail to compile if it uses deprecated APIs.
# In order to do so, uncomment the following line.
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
QT += core gui widgets
SOURCES += \
main.cpp \
@ -18,45 +10,8 @@ HEADERS += \
FORMS += \
mainwindow.ui
# Default rules for deployment.
qnx: target.path = /tmp/$${TARGET}/bin
else: unix:!android: target.path = /opt/$${TARGET}/bin
!isEmpty(target.path): INSTALLS += target
CORE_ROOT_DIR = $$PWD/../../../../../core
include($$CORE_ROOT_DIR/Common/base.pri)
win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../../../build/lib/linux_64/release/ -lgraphics
else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../../build/lib/linux_64/debug/ -lgraphics
else:unix: LIBS += -L$$PWD/../../../../build/lib/linux_64/ -lgraphics
INCLUDEPATH += $$PWD/../../../../DesktopEditor/graphics/pro
DEPENDPATH += $$PWD/../../../../DesktopEditor/graphics/pro
win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../../../build/lib/linux_64/release/ -lkernel
else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../../build/lib/linux_64/debug/ -lkernel
else:unix: LIBS += -L$$PWD/../../../../build/lib/linux_64/ -lkernel
INCLUDEPATH += $$PWD/../../../../build/lib/linux_64
DEPENDPATH += $$PWD/../../../../build/lib/linux_64
win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../../../build/lib/linux_64/release/ -lUnicodeConverter
else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../../build/lib/linux_64/debug/ -lUnicodeConverter
else:unix: LIBS += -L$$PWD/../../../../build/lib/linux_64/ -lUnicodeConverter
INCLUDEPATH += $$PWD/../../../../UnicodeConverter
DEPENDPATH += $$PWD/../../../../UnicodeConverter
win32:CONFIG(release, debug|release): LIBS += -L$$PWD/./release/ -licuuc
else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/./debug/ -licuuc
else:unix: LIBS += -L$$PWD/./ -licuuc
INCLUDEPATH += $$PWD/.
DEPENDPATH += $$PWD/.
win32:CONFIG(release, debug|release): LIBS += -L$$PWD/./release/ -licudata
else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/./debug/ -licudata
else:unix: LIBS += -L$$PWD/./ -licudata
INCLUDEPATH += $$PWD/.
DEPENDPATH += $$PWD/.
ADD_DEPENDENCY(kernel, graphics, UnicodeConverter)
core_linux:include($$CORE_ROOT_DIR/Common/3dParty/icu/icu.pri)

View File

@ -1,7 +1,7 @@
#include "mainwindow.h"
#include <QApplication>
#include "Graphics.h"
#include "../../../../DesktopEditor/graphics/pro/Graphics.h"
int main(int argc, char *argv[])
{
NSGraphics::Create();