Просмотр исходного кода

Merge branch 'master' of https://devel.mephi.ru/dyokunev/tasks

Conflicts:
	redmine.cpp
Dmitry Yu Okunev лет назад: 8
Родитель
Сommit
0e4129a7cb
6 измененных файлов с 40 добавлено и 6 удалено
  1. 4 0
      common.h
  2. 2 2
      main.cpp
  3. 3 0
      mainwindowandroid.cpp
  4. 22 1
      mephi-tasks.pro
  5. 8 2
      redmine.cpp
  6. 1 1
      showtimewindow.cpp

+ 4 - 0
common.h

@@ -5,6 +5,10 @@
 #pragma pointers_to_members( full_generality, virtual_inheritance )
 #endif
 
+#if __ANDROID__ || _M_ARM || __WINRT__
+#define __MOBILE__
+#endif
+
 #include <QApplication>
 
 #include "redmine.h"

+ 2 - 2
main.cpp

@@ -186,8 +186,8 @@ int main ( int argc, char *argv[] )
 		redmine = &_redmine;
 		redmine->apiKey ( settings.apiKey );
 		redmine->init();
-#ifdef __ANDROID__
-        qDebug("Mode: ANDROID");
+#ifdef __MOBILE__
+		qDebug("Mode: MOBILE");
 		MainWindowAndroid w;
 		w.show();
 		rc = a.exec();

+ 3 - 0
mainwindowandroid.cpp

@@ -10,6 +10,9 @@ MainWindowAndroid::MainWindowAndroid ( QWidget *parent ) :
 {
 	this->ui->setupUi ( this );
 	this->setWindowTitle ( "Система «Задачи» НИЯУ МИФИ" );
+#ifdef __WINRT__
+	delete this->ui->quitButton;
+#endif
 }
 
 MainWindowAndroid::~MainWindowAndroid()

+ 22 - 1
mephi-tasks.pro

@@ -11,7 +11,9 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 TARGET = mephi-tasks
 TEMPLATE = app
 #QMAKE_CXX = ccache g++
-QMAKE_CXXFLAGS += -std=c++11 #-O0 -march=native
+gcc:QMAKE_CXXFLAGS += -std=c++11
+gcc:QMAKE_CXXFLAGS_RELEASE += -O2 -march=native
+gcc:QMAKE_CXXFLAGS_DEBUG += -O0 -ggdb3
 
 SOURCES += main.cpp\
     helpwindow.cpp \
@@ -72,6 +74,25 @@ win32:CONFIG(release, debug|release): LIBS += -L$$PWD/build-qtredmine/release/ -
 else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/build-qtredmine/debug/ -lqtredmine
 else:unix: LIBS += -L$$PWD/build-qtredmine-Desktop/ -lqtredmine
 
+win32:contains(QT_ARCH, i386) {
+    LIBS += -LC:/OpenSSL-Win32/lib -llibeay32
+    INCLUDEPATH += C:/OpenSSL-Win32/include
+} else {
+    LIBS += -LC:/OpenSSL-Win64/lib -llibeay32
+    INCLUDEPATH += C:/OpenSSL-Win64/include
+}
+
+winrt {
+    winphone:equals(WINSDK_VER, 8.0) {
+        WINRT_MANIFEST.capabilities += ID_CAP_NETWORKING
+    } else {
+        WINRT_MANIFEST.capabilities += internetClient
+    }
+    CONFIG += windeployqt
+    QMAKE_CXXFLAGS += -D__WINRT__
+}
+
+
 INCLUDEPATH += $$PWD/qtredmine
 DEPENDPATH += $$PWD/qtredmine
 

+ 8 - 2
redmine.cpp

@@ -23,9 +23,15 @@
 #include <QDir>
 #include <QFile>
 #include <QStandardPaths>
+#include <QMessageBox>
 
 Redmine::Redmine()
 {
+	if ( ! QSslSocket::supportsSsl() ) {
+		qDebug ( "! QSslSocket::supportsSsl()" );
+		QMessageBox messageBox;
+		messageBox.critical(0, "Error", "Отсутствует поддержка SSL. Проверьте наличие библиотек libeay32.dll и ssleay32.dll, либо установите пакет OpenSSL.");
+	}
 	this->setBaseUrl ( SERVER_URL );
 
 #ifdef __MOBILE__
@@ -83,8 +89,8 @@ int Redmine::init()
 		this->setAuth ( this->_apiKey );
 	}
 
-	connect ( this, SIGNAL ( requestFinished ( void*, callback_t, QNetworkReply*, QJsonDocument*, void* ) ),
-	          this, SLOT ( callback_dispatcher ( void*, callback_t, QNetworkReply*, QJsonDocument*, void* ) ) );
+	connect ( this, SIGNAL ( requestFinished     ( void*, callback_t, QNetworkReply*, QJsonDocument*, void* ) ),
+		  this, SLOT   ( callback_dispatcher ( void*, callback_t, QNetworkReply*, QJsonDocument*, void* ) ) );
 	this->initBarrier_jobsDone = 0;
 	QNetworkReply *updateIssueStatusesReply = this->updateIssueStatuses();
 	// Wait until issue statuses will be received:

+ 1 - 1
showtimewindow.cpp

@@ -20,7 +20,7 @@ ShowTimeWindow::ShowTimeWindow(QWidget *parent) :
 	this->ui->timeEntries->horizontalHeader()->setSectionResizeMode ( 4, QHeaderView::Interactive );
 	this->ui->timeEntries->horizontalHeader()->setSectionResizeMode ( 5, QHeaderView::Interactive );
 
-#ifdef __ANDROID__
+#ifdef __MOBILE__
 	this->ui->timeEntries->horizontalHeader()->setSectionResizeMode ( 6, QHeaderView::Interactive );
 
 	this->ui->timeEntries->horizontalHeader()->resizeSection ( 0, 80 );