File tree Expand file tree Collapse file tree 4 files changed +16
-13
lines changed
Expand file tree Collapse file tree 4 files changed +16
-13
lines changed Original file line number Diff line number Diff line change 11# Qt-generated files and directories
22
3+ .gitignore
4+
35src /greasepad.pro.user
6+ src /.qtcreator /
47
58/build-greasepad-Desktop_Qt_5_11_0_MSVC2015_64bit-Debug /
69/build-greasepad-Desktop_Qt_5_11_0_MSVC2015_64bit-Profile /
Original file line number Diff line number Diff line change @@ -19,10 +19,10 @@ DEFINES += QT_DEPRECATED_WARNINGS
1919
2020
2121# set assember's flags (MinGW), syntax: -Wa,<comma-separated list>
22- contains (QMAKE_CC, gcc ) {
23- # MinGW
24- QMAKE_CXXFLAGS += -Wa ,-mbig-obj
25- }
22+ # contains(QMAKE_CC, gcc) {
23+ # # MinGW
24+ # QMAKE_CXXFLAGS += -Wa,-mbig-obj
25+ # }
2626
2727
2828SOURCES += \
@@ -77,11 +77,11 @@ FORMS +=
7777
7878# Eigen
7979# INCLUDEPATH += C:/Eigen/eigen-3.4.0/source
80- INCLUDEPATH += C :/clone/eigen
80+ INCLUDEPATH += D :/clone/eigen
8181
8282# Option
83- INCLUDEPATH += " C:/Program Files (x86)/Visual Leak Detector/include/"
84- LIBS += -L " C:/Program Files (x86)/Visual Leak Detector/lib/Win64"
83+ # INCLUDEPATH += "C:/Program Files (x86)/Visual Leak Detector/include/"
84+ # LIBS += -L"C:/Program Files (x86)/Visual Leak Detector/lib/Win64"
8585
8686RC_ICONS += icons/Tango/preferences-desktop-peripherals.ico
8787
Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ int main(int argc, char *argv[])
2525 QApplication const a (argc, argv);
2626
2727 QApplication::setApplicationName ( " GreasePad" );
28- QApplication::setApplicationVersion ( " 1.2.0 " );
28+ QApplication::setApplicationVersion ( " 1.2.1 " );
2929 QApplication::setOrganizationName ( " Fraunhofer IOSB" );
3030 QApplication::setOrganizationDomain ( " iosb.fraunhofer.de" );
3131
Original file line number Diff line number Diff line change @@ -564,15 +564,15 @@ void MainWindow::createToolBars()
564564
565565
566566 labelBoxAlphaRecogn = std::make_unique<QLabel>( " Recognition " );
567- QFont font = labelBoxAlphaRecogn->font ();
568- font.setPointSize ( font.pointSize ()+1 );
569- labelBoxAlphaRecogn->setFont (font);
567+ // QFont font = labelBoxAlphaRecogn->font();
568+ // font.setPointSize( font.pointSize()+1);
569+ // labelBoxAlphaRecogn->setFont(font);
570570
571571 labelBoxAlphaSnap = std::make_unique<QLabel>( " Snap " );
572- labelBoxAlphaSnap->setFont (font);
572+ // labelBoxAlphaSnap->setFont(font);
573573
574574 labelBoxOpacity = std::make_unique<QLabel>( " Opacity " );
575- labelBoxOpacity->setFont (font);
575+ // labelBoxOpacity->setFont(font);
576576
577577 barTesting = std::make_unique<QToolBar>( " Testing" );
578578 barTesting->addWidget ( labelBoxAlphaRecogn.get ());
You can’t perform that action at this time.
0 commit comments