Browse Source

Merge pull request #560 from treefrogframework/master

Updated to TreeFrog Framework v1.7.2.
Brian Hauer 11 years ago
parent
commit
ff0a0c5201
2 changed files with 10 additions and 8 deletions
  1. 8 8
      toolset/setup/linux/installer.py
  2. 2 0
      treefrog/controllers/fortunecontroller.h

+ 8 - 8
toolset/setup/linux/installer.py

@@ -274,14 +274,14 @@ class Installer:
     # TreeFrog Framework
     #
     self.__run_command("sudo apt-get install qt4-qmake libqt4-dev libqt4-sql-mysql g++", True)
-    self.__download("http://downloads.sourceforge.net/project/treefrog/src/treefrog-1.7.tar.gz")
-    self.__run_command("tar xzf treefrog-1.7.tar.gz")
-    self.__run_command("rm treefrog-1.7.tar.gz")
-    self.__run_command("./configure", cwd="treefrog-1.7")
-    self.__run_command("make", cwd="treefrog-1.7/src")
-    self.__run_command("sudo make install", cwd="treefrog-1.7/src")
-    self.__run_command("make", cwd="treefrog-1.7/tools")
-    self.__run_command("sudo make install", cwd="treefrog-1.7/tools")
+    self.__download("http://downloads.sourceforge.net/project/treefrog/src/treefrog-1.7.2.tar.gz")
+    self.__run_command("tar xzf treefrog-1.7.2.tar.gz")
+    self.__run_command("rm treefrog-1.7.2.tar.gz")
+    self.__run_command("./configure", cwd="treefrog-1.7.2")
+    self.__run_command("make", cwd="treefrog-1.7.2/src")
+    self.__run_command("sudo make install", cwd="treefrog-1.7.2/src")
+    self.__run_command("make", cwd="treefrog-1.7.2/tools")
+    self.__run_command("sudo make install", cwd="treefrog-1.7.2/tools")
 
     #
     # Vert.x

+ 2 - 0
treefrog/controllers/fortunecontroller.h

@@ -10,6 +10,8 @@ class T_CONTROLLER_EXPORT FortuneController : public ApplicationController
 public:
     FortuneController() { }
     FortuneController(const FortuneController &other);
+    bool sessionEnabled() const { return false; }
+    bool transactionEnabled() const { return false; }
 
 public slots:
     void index();