demoLauncher should now work on all platforms

3 files changed, 8 insertions, 6 deletions

diff --git a/demos/demoLauncher/demoLauncher.pro b/demos/demoLauncher/demoLauncher.pro
index 8353a8d9..01ba2261 100644
--- a/demos/demoLauncher/demoLauncher.pro
+++ b/demos/demoLauncher/demoLauncher.pro
@@ -1,7 +1,8 @@
 !include( ../demos.pri ):error( "Couldn't find the demos.pri file!" )
-include(charts/charts.pri)
 
 TARGET = demoLauncher
 SOURCES += main.cpp\
         widget.cpp
 HEADERS  += widget.h
+
+DEFINES += "BINPATH=$$join($$CHART_BUILD_BIN_DIR, ", ")"
diff --git a/demos/demoLauncher/widget.cpp b/demos/demoLauncher/widget.cpp
index c8edbda6..86c34c76 100644
--- a/demos/demoLauncher/widget.cpp
+++ b/demos/demoLauncher/widget.cpp
@@ -4,20 +4,22 @@
 #include <QGridLayout>
 #include <QApplication>
 #include <QProcess>
-#include <QTimer>
 
 Widget::Widget(QWidget *parent)
     : QWidget(parent),
       m_demoApp(0)
 {
     QList<QFileInfo> appList;
-
-    QDir appFolder(QApplication::applicationDirPath());
+    QDir appFolder = QDir(BINPATH);
     appList = appFolder.entryInfoList(QDir::Files);
 
     for (int k = appList.count() - 1; k >= 0; k--) {
         QString name = appList[k].fileName();
-        if (name.endsWith("exp") || name.endsWith("dll") || name.endsWith("lib") || name.startsWith("tst_"))
+        if (name.endsWith("exp")
+                || name.endsWith("dll")
+                || name.endsWith("lib")
+                || name.startsWith("tst_")
+                || name.startsWith("demoLauncher"))
             appList.removeAt(k);
     }
 
diff --git a/demos/demoLauncher/widget.h b/demos/demoLauncher/widget.h
index 1a8a7858..863b7df2 100644
--- a/demos/demoLauncher/widget.h
+++ b/demos/demoLauncher/widget.h
@@ -15,7 +15,6 @@ public:
 
 public slots:
     void runApp();
-//    void runAppShow();
 
 private:
     QProcess *m_demoApp;