okay, let's revert this for now 0.9.16
authorunc0rr
Sat, 17 Sep 2011 21:48:18 +0400
branch0.9.16
changeset 5956 39d8cdee4391
parent 5953 57af6f3abf4a (diff)
parent 5954 2aead3f940b0 (current diff)
child 5957 a6224655647c
okay, let's revert this for now
--- a/CMakeLists.txt	Sat Sep 17 13:40:54 2011 -0400
+++ b/CMakeLists.txt	Sat Sep 17 21:48:18 2011 +0400
@@ -12,7 +12,7 @@
 
 
 #detect Mercurial revision (if present)
-set(version_suffix "-dev") #UNSET THIS VARIABLE AT RELEASE TIME
+set(version_suffix "") #UNSET THIS VARIABLE AT RELEASE TIME
 set(HGCHANGED "")
 IF(version_suffix MATCHES "-dev")
 	set(HW_DEV true)
@@ -42,7 +42,7 @@
 set(CPACK_PACKAGE_VERSION_MAJOR 0)
 set(CPACK_PACKAGE_VERSION_MINOR 9)
 set(CPACK_PACKAGE_VERSION_PATCH 16${version_suffix})
-set(HEDGEWARS_PROTO_VER 38)
+set(HEDGEWARS_PROTO_VER 39)
 set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 
 
--- a/QTfrontend/chatwidget.cpp	Sat Sep 17 13:40:54 2011 -0400
+++ b/QTfrontend/chatwidget.cpp	Sat Sep 17 21:48:18 2011 +0400
@@ -203,7 +203,7 @@
         QList<QListWidgetItem *> items = chatNicks->findItems(nick, Qt::MatchExactly);
         if (items.size() < 1)
             return;
-        QMenu * popup = new QMenu();
+        QMenu * popup = new QMenu(this);
         // selecting an item will automatically scroll there, so let's save old position
         QScrollBar * scrollBar = chatNicks->verticalScrollBar();
         int oldScrollPos = scrollBar->sliderPosition();