Skip to content

Commit

Permalink
Renew files v3.1.12
Browse files Browse the repository at this point in the history
  • Loading branch information
CineEncoder committed Feb 20, 2021
1 parent 6d8c156 commit 3fc5cb3
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 11 deletions.
23 changes: 12 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Generated by qmake (3.1) (Qt 5.15.2)
# Project: ../cine-encoder-3.1/app/cine_encoder.pro
# Template: app
# Command: /usr/bin/qmake -o Makefile ../cine-encoder-3.1/app/cine_encoder.pro -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug
# Command: /usr/bin/qmake -o Makefile ../cine-encoder-3.1/app/cine_encoder.pro -spec linux-g++ CONFIG+=qtquickcompiler
#############################################################################

MAKEFILE = Makefile
Expand All @@ -14,9 +14,9 @@ EQ = =

CC = gcc
CXX = g++
DEFINES = -DQT_QML_DEBUG -DQT_MULTIMEDIA_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB
CFLAGS = -pipe -g -Wall -Wextra -D_REENTRANT -fPIC $(DEFINES)
CXXFLAGS = -pipe -g -std=gnu++11 -Wall -Wextra -D_REENTRANT -fPIC $(DEFINES)
DEFINES = -DQT_NO_DEBUG -DQT_MULTIMEDIA_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB
CFLAGS = -pipe -O2 -Wall -Wextra -D_REENTRANT -fPIC $(DEFINES)
CXXFLAGS = -pipe -O2 -std=gnu++11 -Wall -Wextra -D_REENTRANT -fPIC $(DEFINES)
INCPATH = -I../cine-encoder-3.1/app -I. -I/usr/include/qt -I/usr/include/qt/QtMultimedia -I/usr/include/qt/QtWidgets -I/usr/include/qt/QtGui -I/usr/include/qt/QtNetwork -I/usr/include/qt/QtCore -I. -I. -I/usr/lib/qt/mkspecs/linux-g++
QMAKE = /usr/bin/qmake
DEL_FILE = rm -f
Expand All @@ -39,7 +39,7 @@ COMPRESS = gzip -9f
DISTNAME = cine_encoder1.0.0
DISTDIR = /home/helg/Documents/QtCreatorProjects/builddir/.tmp/cine_encoder1.0.0
LINK = g++
LFLAGS =
LFLAGS = -Wl,-O1
LIBS = $(SUBLIBS) -lmediainfo /usr/lib/libQt5Multimedia.so /usr/lib/libQt5Widgets.so /usr/lib/libQt5Gui.so /usr/lib/libQt5Network.so /usr/lib/libQt5Core.so -lGL -lpthread
AR = ar cqs
RANLIB =
Expand Down Expand Up @@ -314,7 +314,7 @@ DIST = /usr/lib/qt/mkspecs/features/spec_pre.prf \
/usr/lib/qt/mkspecs/features/default_pre.prf \
/usr/lib/qt/mkspecs/features/resolve_config.prf \
/usr/lib/qt/mkspecs/features/default_post.prf \
/usr/lib/qt/mkspecs/features/qml_debug.prf \
/usr/lib/qt/mkspecs/features/qtquickcompiler.prf \
/usr/lib/qt/mkspecs/features/warn_on.prf \
/usr/lib/qt/mkspecs/features/qt.prf \
/usr/lib/qt/mkspecs/features/resources_functions.prf \
Expand Down Expand Up @@ -583,7 +583,7 @@ Makefile: ../cine-encoder-3.1/app/cine_encoder.pro /usr/lib/qt/mkspecs/linux-g++
/usr/lib/qt/mkspecs/features/default_pre.prf \
/usr/lib/qt/mkspecs/features/resolve_config.prf \
/usr/lib/qt/mkspecs/features/default_post.prf \
/usr/lib/qt/mkspecs/features/qml_debug.prf \
/usr/lib/qt/mkspecs/features/qtquickcompiler.prf \
/usr/lib/qt/mkspecs/features/warn_on.prf \
/usr/lib/qt/mkspecs/features/qt.prf \
/usr/lib/qt/mkspecs/features/resources_functions.prf \
Expand All @@ -600,7 +600,7 @@ Makefile: ../cine-encoder-3.1/app/cine_encoder.pro /usr/lib/qt/mkspecs/linux-g++
/usr/lib/qt/mkspecs/features/lex.prf \
../cine-encoder-3.1/app/cine_encoder.pro \
../cine-encoder-3.1/app/files.qrc
$(QMAKE) -o Makefile ../cine-encoder-3.1/app/cine_encoder.pro -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug
$(QMAKE) -o Makefile ../cine-encoder-3.1/app/cine_encoder.pro -spec linux-g++ CONFIG+=qtquickcompiler
/usr/lib/qt/mkspecs/features/spec_pre.prf:
/usr/lib/qt/mkspecs/common/unix.conf:
/usr/lib/qt/mkspecs/common/linux.conf:
Expand Down Expand Up @@ -828,7 +828,7 @@ Makefile: ../cine-encoder-3.1/app/cine_encoder.pro /usr/lib/qt/mkspecs/linux-g++
/usr/lib/qt/mkspecs/features/default_pre.prf:
/usr/lib/qt/mkspecs/features/resolve_config.prf:
/usr/lib/qt/mkspecs/features/default_post.prf:
/usr/lib/qt/mkspecs/features/qml_debug.prf:
/usr/lib/qt/mkspecs/features/qtquickcompiler.prf:
/usr/lib/qt/mkspecs/features/warn_on.prf:
/usr/lib/qt/mkspecs/features/qt.prf:
/usr/lib/qt/mkspecs/features/resources_functions.prf:
Expand All @@ -846,7 +846,7 @@ Makefile: ../cine-encoder-3.1/app/cine_encoder.pro /usr/lib/qt/mkspecs/linux-g++
../cine-encoder-3.1/app/cine_encoder.pro:
../cine-encoder-3.1/app/files.qrc:
qmake: FORCE
@$(QMAKE) -o Makefile ../cine-encoder-3.1/app/cine_encoder.pro -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug
@$(QMAKE) -o Makefile ../cine-encoder-3.1/app/cine_encoder.pro -spec linux-g++ CONFIG+=qtquickcompiler

qmake_all: FORCE

Expand Down Expand Up @@ -1414,7 +1414,7 @@ compiler_moc_predefs_make_all: moc_predefs.h
compiler_moc_predefs_clean:
-$(DEL_FILE) moc_predefs.h
moc_predefs.h: /usr/lib/qt/mkspecs/features/data/dummy.cpp
g++ -pipe -g -std=gnu++11 -Wall -Wextra -dM -E -o moc_predefs.h /usr/lib/qt/mkspecs/features/data/dummy.cpp
g++ -pipe -O2 -std=gnu++11 -Wall -Wextra -dM -E -o moc_predefs.h /usr/lib/qt/mkspecs/features/data/dummy.cpp

compiler_moc_header_make_all: moc_about.cpp moc_dialog.cpp moc_donate.cpp moc_mainwindow.cpp moc_preset.cpp moc_selectpreset.cpp moc_settings.cpp moc_taskcomplete.cpp
compiler_moc_header_clean:
Expand Down Expand Up @@ -1586,6 +1586,7 @@ moc_taskcomplete.o: moc_taskcomplete.cpp
install_target: first FORCE
@test -d $(INSTALL_ROOT)/usr/bin || mkdir -p $(INSTALL_ROOT)/usr/bin
$(QINSTALL_PROGRAM) $(QMAKE_TARGET) $(INSTALL_ROOT)/usr/bin/$(QMAKE_TARGET)
-$(STRIP) $(INSTALL_ROOT)/usr/bin/$(QMAKE_TARGET)

uninstall_target: FORCE
-$(DEL_FILE) $(INSTALL_ROOT)/usr/bin/$(QMAKE_TARGET)
Expand Down
4 changes: 4 additions & 0 deletions app/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,12 @@ MainWindow::MainWindow(QWidget *parent) :
ui(new Ui::MainWindow)
{
ui->setupUi(this);
#ifdef Q_OS_WIN64
this->setWindowFlags(Qt::Window | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint |
Qt::WindowMaximizeButtonHint | Qt::WindowMinimizeButtonHint);
#else
this->setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
#endif
this->setMouseTracking(true);
this->setAcceptDrops(true);
}
Expand Down

0 comments on commit 3fc5cb3

Please sign in to comment.