yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3716
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Thu 2015-08-27 11:47:22 +0200
message:
  Some more updates toward Qt5.
modified:
  core/main/main.py.in
  gui/CMakeLists.txt


--
lp:yade
https://code.launchpad.net/~yade-pkg/yade/git-trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription

=== modified file 'core/main/main.py.in'
--- core/main/main.py.in	2015-08-27 09:47:13 +0000
+++ core/main/main.py.in	2015-08-27 09:47:22 +0000
@@ -283,8 +283,8 @@
 	import PyQt5
 	from PyQt5 import QtGui
 	from PyQt5.QtCore import *
-	import yade.qt # this yade.qt is different from the one that comes with qt3
-	qapp=QtGui.QApplication(sys.argv)
+	from PyQt5.QtWidgets import *
+	qapp=QApplication(sys.argv)
 	userSession(qt5=True,qapp=qapp)
 
 if __name__ == "__main__":

=== modified file 'gui/CMakeLists.txt'
--- gui/CMakeLists.txt	2015-08-27 09:46:29 +0000
+++ gui/CMakeLists.txt	2015-08-27 09:47:22 +0000
@@ -18,7 +18,7 @@
     
     EXECUTE_PROCESS(
           COMMAND "pyrcc5" "-o" "${CMAKE_BINARY_DIR}/img_rc.py" "img.qrc"
-          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/qt4
+          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/qt5
           RESULT_VARIABLE rv
           )