palo/valentina
1
0
Fork 0
mirror of https://gitlab.com/smart-pattern/valentina.git synced 2024-09-28 19:31:32 +02:00
Code Issues Projects Releases Wiki Activity

-

Browse source 
--HG--
branch : develop
This commit is contained in:
Alex 2015-08-27 20:34:29 +03:00
parent 8cd58af79b
commit 3da8df7bbb
1 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/app/main.cpp
View file

@ -30,12 +30,6 @@
#include "core/vapplication.h" #include "core/vapplication.h"
#include <QMessageBox> // For QT_REQUIRE_VERSION #include <QMessageBox> // For QT_REQUIRE_VERSION
//not needed that include, added to allow merge go
#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
# include "../../libs/vmisc/backport/qcommandlineparser.h"
#else
# include <QCommandLineParser>
#endif
// Lock producing random attribute order in XML // Lock producing random attribute order in XML
// https://stackoverflow.com/questions/27378143/qt-5-produce-random-attribute-order-in-xml // https://stackoverflow.com/questions/27378143/qt-5-produce-random-attribute-order-in-xml
extern Q_CORE_EXPORT QBasicAtomicInt qt_qhash_seed; extern Q_CORE_EXPORT QBasicAtomicInt qt_qhash_seed;
@ -61,16 +55,7 @@ int main(int argc, char *argv[])
MainWindow w; MainWindow w;
app.setWindowIcon(QIcon(":/icon/64x64/icon64x64.png")); app.setWindowIcon(QIcon(":/icon/64x64/icon64x64.png"));
app.setMainWindow(&w); app.setMainWindow(&w);
#ifdef STUPID_MERGE
QCommandLineParser parser;
parser.setApplicationDescription(QCoreApplication::translate("main", "Pattern making program."));
parser.addHelpOption();
// Process the actual command line arguments given by the user
parser.process(app);
QStringList args = parser.positionalArguments();
#endif
auto args = app.CommandLine()->OptInputFileNames(); auto args = app.CommandLine()->OptInputFileNames();
//Before we load pattern show window. //Before we load pattern show window.