Reorganize the calculator example.

Change-Id: I6696fcc426296a5d17180edfbdaee7842429e0c9
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>

10 files changed, 35 insertions, 26 deletions

diff --git a/examples/calculator-widgets-static/calculator-widgets-static.pro b/examples/calculator-widgets-static/calculator-widgets-static.pro
deleted file mode 100644
index 5bf4c27..0000000
--- a/examples/calculator-widgets-static/calculator-widgets-static.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-QT += widgets scxml
-
-CONFIG += c++11
-
-STATECHARTS = ../calculator-common/calculator.scxml
-
-SOURCES += \
-    calculator-widgets-static.cpp \
-    ../calculator-common/mainwindow.cpp
-
-FORMS += \
-    ../calculator-common/mainwindow.ui
-
-HEADERS += \
-    ../calculator-common/mainwindow.h
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/scxml/calculator-widgets
-INSTALLS += target
-
-load(qscxmlc)
diff --git a/examples/calculator/calculator.pro b/examples/calculator/calculator.pro
new file mode 100644
index 0000000..9c0ef68
--- /dev/null
+++ b/examples/calculator/calculator.pro
@@ -0,0 +1,21 @@
+QT += widgets scxml
+
+CONFIG += c++11
+
+STATECHARTS = calculator.scxml
+
+SOURCES += \
+    main.cpp \
+    mainwindow.cpp
+
+HEADERS += \
+    mainwindow.h
+
+FORMS += \
+    mainwindow.ui
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/scxml/calculator
+INSTALLS += target
+
+load(qscxmlc)
diff --git a/examples/calculator-common/calculator.scxml b/examples/calculator/calculator.scxml
index 2b1e926..2b1e926 100644
--- a/examples/calculator-common/calculator.scxml
+++ b/examples/calculator/calculator.scxml
diff --git a/examples/calculator/doc/images/calculator.png b/examples/calculator/doc/images/calculator.png
new file mode 100644
index 0000000..443242a
--- /dev/null
+++ b/examples/calculator/doc/images/calculator.png
diff --git a/examples/calculator-widgets-static/doc/src/calculator-widgets-static.qdoc b/examples/calculator/doc/src/calculator.qdoc
index 6327cb3..9edb0c3 100644
--- a/examples/calculator-widgets-static/doc/src/calculator-widgets-static.qdoc
+++ b/examples/calculator/doc/src/calculator.qdoc
@@ -26,9 +26,18 @@
 ****************************************************************************/
 
 /*!
-    \example calculator-widgets-static
-    \title Qt SCXML: Calculator Example (Static)
+    \example calculator
+    \title Qt SCXML Calculator Example
     \ingroup examples-qtscxml
 
-    \brief Demonstrates...
+    \image calculator.png
+
+    \brief Implements the Calculator example presented in the SCXML
+    Specification.
+
+    \e {Calculator} uses Qt SCXML to implement the
+    \l{SCXML Specification - Calculator Example}{Calculator Example}
+    presented in the SCXML Specification.
+
+    \include examples-run.qdocinc
 */
diff --git a/examples/calculator-widgets-static/calculator-widgets-static.cpp b/examples/calculator/main.cpp
index 94bb4a3..2587e2b 100644
--- a/examples/calculator-widgets-static/calculator-widgets-static.cpp
+++ b/examples/calculator/main.cpp
@@ -49,7 +49,7 @@
 ****************************************************************************/
 
 #include "calculator.h"
-#include "../calculator-common/mainwindow.h"
+#include "mainwindow.h"
 
 #include <QApplication>
 
diff --git a/examples/calculator-common/mainwindow.cpp b/examples/calculator/mainwindow.cpp
index eacafaa..eacafaa 100644
--- a/examples/calculator-common/mainwindow.cpp
+++ b/examples/calculator/mainwindow.cpp
diff --git a/examples/calculator-common/mainwindow.h b/examples/calculator/mainwindow.h
index c8d77f3..c8d77f3 100644
--- a/examples/calculator-common/mainwindow.h
+++ b/examples/calculator/mainwindow.h
diff --git a/examples/calculator-common/mainwindow.ui b/examples/calculator/mainwindow.ui
index 8001ff1..8001ff1 100644
--- a/examples/calculator-common/mainwindow.ui
+++ b/examples/calculator/mainwindow.ui
diff --git a/examples/examples.pro b/examples/examples.pro
index 20ef6c2..0ee3d2e 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -6,8 +6,8 @@ qtHaveModule(widgets) {
     SUBDIRS +=  trafficlight-widgets-dynamic
     SUBDIRS +=  mediaplayer-widgets-static
     SUBDIRS +=  mediaplayer-widgets-dynamic
+    SUBDIRS +=  calculator
     SUBDIRS +=  pinball
-    SUBDIRS +=  calculator-widgets-static
 }
 
 qtHaveModule(qml) {