Mercurial > zcinema / changeset

--- a/CMakeLists.txt	Sun Jun 07 15:52:33 2015 +0300
+++ b/CMakeLists.txt	Sun Jun 07 18:11:06 2015 +0300
@@ -53,6 +53,8 @@
 if (NOT MSVC)
 	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W -Wall")
 else()
+	# Some Qt headers (QMap and QHash) trigger C4180, disable that.
+	add_definitions ("/wd4180 /D_CRT_SECURE_NO_WARNINGS /nologo")
 	set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Za")
 endif()
 

--- a/config/configwindow.cpp	Sun Jun 07 15:52:33 2015 +0300
+++ b/config/configwindow.cpp	Sun Jun 07 18:11:06 2015 +0300
@@ -296,8 +296,4 @@
 	{
 		reject();
 	}
-	else if (btn == ui.buttonBox->button (QDialogButtonBox::Apply))
-	{
-		saveSettings();
-	}
 }
\ No newline at end of file

--- a/ui/configbox.ui	Sun Jun 07 15:52:33 2015 +0300
+++ b/ui/configbox.ui	Sun Jun 07 18:11:06 2015 +0300
@@ -20,7 +20,7 @@
    <string>Dialog</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../zcinema.qrc">
+   <iconset>
     <normaloff>:/icons/zcinema.ico</normaloff>:/icons/zcinema.ico</iconset>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -239,15 +239,13 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="../zcinema.qrc"/>
- </resources>
+ <resources/>
  <connections>
   <connection>
    <sender>wad_clear</sender>