111

logtimewindow.cpp

@@ -22,7 +22,7 @@ LogTimeWindow::LogTimeWindow ( QWidget *parent ) :
 	this->ui->sinceInput->setTime ( QTime::fromString ( "09:00", "hh':'mm" ) );
 	this->setWindowTitle ( "Система «Задачи» НИЯУ МИФИ: Учёт времени" );
 	connect ( redmine, SIGNAL ( callback_call       ( void*, callback_t, QNetworkReply*, QJsonDocument*, void* ) ),
-		  this,    SLOT   ( callback_dispatcher ( void*, callback_t, QNetworkReply*, QJsonDocument*, void* ) ) );
+              this,    SLOT   ( callback_dispatcher ( void*, callback_t, QNetworkReply*, QJsonDocument*, void* ) ) );
 	this->selected_project_id = 0;
 	this->timeEntry.setProjectId ( redmine->myProject() ["id"].toInt() );
 	this->updateLastLogTime();

mainwindowandroid.ui

@@ -36,6 +36,19 @@
       </widget>
      </item>
      <item>
+      <widget class="QPushButton" name="pushButton">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>PushButton</string>
+       </property>
+      </widget>
+     </item>
+     <item>
       <widget class="QPushButton" name="quitButton">
        <property name="text">
         <string>Выйти</string>

mephi-tasks.pro

@@ -65,8 +65,8 @@ FORMS    += \
     mainwindowandroid.ui \
     logtimewindow.ui
 
-win32:CONFIG(release, debug|release): LIBS += -L$$PWD/build-qtredmine-Desktop_Qt_5_4_1_MinGW_32bit-Release/release/ -lqtredmine
-else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/build-qtredmine-Desktop_Qt_5_4_1_MinGW_32bit-Debug/debug/ -lqtredmine
+win32:CONFIG(release, debug|release): LIBS += -L$$PWD/build-qtredmine-Desktop_Qt_5_5_1_MinGW_32bit-Release/release/ -lqtredmine
+else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/build-qtredmine-Desktop_Qt_5_5_1_MinGW_32bit-Debug/debug/ -lqtredmine
 else:unix: LIBS += -L$$PWD/build-qtredmine-Desktop/ -lqtredmine
 
 INCLUDEPATH += $$PWD/qtredmine

qtredmine

@@ -1 +1 @@
-Subproject commit c4b5c00a6965e28015e286b85328d7e88459fed4
+Subproject commit fd6b96a9407f79c9a49f84c79488343a19693af7