linux build

Author: GeniusGoldDev

.gitignore

@@ -24,3 +24,4 @@ qtactiveqt-everywhere-src-6.7.1/
 mugi-query-0.0.1-win64_/
 qrc_icons.cpp
 CMakeLists.txt.user
+build/

CMakeLists.txt

@@ -6,10 +6,18 @@ project(mugi-query VERSION 1.0 LANGUAGES CXX)
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
+if (WIN32)
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Sql Svg Widgets AxContainer Test)
-find_package(qwt REQUIRED)
+else()
+find_package(Qt6 REQUIRED COMPONENTS Core Gui Sql Svg Widgets Test)
+endif()
+
+find_package(Qwt REQUIRED)
+
+#qt_standard_project_setup()
+set(CMAKE_AUTOMOC TRUE)
+set(CMAKE_AUTOUIC TRUE)
 
-qt_standard_project_setup()
 
 # emmet
 add_library(emmet SHARED
@@ -268,13 +276,31 @@ qt6_add_resources(mugi-query "icons"
         ${icons_resource_files}
 )
 
-target_link_libraries(mugi-query PUBLIC
-    Qt::AxContainer
-    Qt::Core
-    Qt::Gui
-    Qt::Sql
-    Qt::Svg
-    qwt
-    emmet
-    sqlparse
-)
+if (WIN32)
+    target_link_libraries(mugi-query PUBLIC
+        Qt::AxContainer
+        Qt::Core
+        Qt::Gui
+        Qt::Widgets
+        Qt::Sql
+        Qt::Svg
+        Qwt
+        emmet
+        sqlparse
+    )
+else()
+    target_link_libraries(mugi-query PUBLIC
+        Qt::Core
+        Qt::Gui
+        Qt::Widgets
+        Qt::Sql
+        Qt::Svg
+        Qwt
+        emmet
+        sqlparse
+    )
+endif()
+
+# LD_LIBRARY_PATH="/usr/local/qwt-6.3.0-dev/lib:/usr/local/lib" /usr/local/bin/mugi-query
+install(TARGETS mugi-query emmet sqlparse)
+install(FILES emmet.json DESTINATION share)

README.md

@@ -47,24 +47,28 @@ Data import
 
 ### Linux (Ubuntu)
 
-In terminal run
-
 ```bash
-# installs qt5 and build tools
-sudo apt install git build-essential qtbase5-dev qtchooser
+# install qt6 and build tools
+sudo apt install git build-essential cmake ninja-build qt6-base-dev libqt6svg6-dev libxkbcommon-dev
 
-# installs qwt and dependencies
-sudo apt install libqwt-qt5-dev libqt5svg5-dev 
+# build qwt
+git clone https://git.code.sf.net/p/qwt/git qwt-git
+cd qwt-git
+qmake6
+make
+sudo install
+cd ..
 
-# installs sql plugins
-sudo apt install libqt5sql5-mysql libqt5sql5-odbc libqt5sql5-psql libqt5sql5-sqlite libqt5sql5-tds libqt5sql5-ibase 
+# install sql plugins
+sudo apt install libqt6sql6-ibase libqt6sql6-mysql libqt6sql6-odbc libqt6sql6-psql libqt6sql6-sqlite
 
 git clone https://github.com/mugiseyebrows/mugi-query.git
 cd mugi-query
-qmake -qt=5 'CONFIG+=release'
-make
-make clean
-strip mugi-query
-sudo make install # installs to /usr/local/bin
-python desktop.py # copies icons, creates desktop file
+mkdir build
+cd build
+cmake -G Ninja ..
+cmake --build .
+sudo cmake --install .
+cd ..
+python3 desktop.py
 ```

cmake/FindQwt.cmake

@@ -1,5 +1,5 @@
 
-find_library(QWT_LIBRARY NAMES qwt)
+find_library(QWT_LIBRARY NAMES Qwt)
 
 find_path(QWT_INCLUDE_DIR NAMES qwt.h)
 
@@ -9,14 +9,14 @@ find_path(QWT_INCLUDE_DIR NAMES qwt.h)
 include(FindPackageHandleStandardArgs)
 
 find_package_handle_standard_args(
-    qwt
+    Qwt
     FOUND_VAR QWT_FOUND
     REQUIRED_VARS QWT_LIBRARY QWT_INCLUDE_DIR
 )
 
 if (QWT_FOUND)
-    add_library(qwt UNKNOWN IMPORTED)
-    set_target_properties(qwt PROPERTIES
+    add_library(Qwt UNKNOWN IMPORTED)
+    set_target_properties(Qwt PROPERTIES
         IMPORTED_LOCATION ${QWT_LIBRARY}
         INTERFACE_INCLUDE_DIRECTORIES ${QWT_INCLUDE_DIR}
     )

desktop.py

@@ -14,8 +14,10 @@
     os.makedirs(os.path.dirname(dst), exist_ok=True)
     shutil.copy(src,dst)
 
+# /usr/bin/bash -c "LD_LIBRARY_PATH=/usr/local/lib:/usr/local/qwt-6.3.0-dev/lib /usr/local/bin/mugi-query"
+
 icon = dst = os.path.join(icons,'256x256','apps','%s.png' % name)
-executable = '/usr/local/bin/%s' % name
+executable = '/usr/bin/bash -c "LD_LIBRARY_PATH=/usr/local/lib:/usr/local/qwt-6.3.0-dev/lib /usr/local/bin/mugi-query"'
 categories = ['Utility']
 with open(desktop,'w') as f:
     f.write('[Desktop Entry]\nName=%s\nExec=%s\nIcon=%s\nType=Application\nCategories=%s' % (name,executable,icon,';'.join(categories) + ';'))

src/copyeventfilter.cpp

@@ -26,7 +26,7 @@ void CopyEventFilter::copyTsv(QTableView *view)
 {
     CopyEventFilter* filter = new CopyEventFilter(view);
     filter->setView(view);
-    connect(filter,CopyEventFilter::copy,[=](){
+    connect(filter,&CopyEventFilter::copy,[=](){
         ClipboardUtil::copyTsv(view);
     });
 }

src/emmet.cpp

@@ -18,33 +18,37 @@ static QStringList toStringList(const QJsonArray& arr) {
     return res;
 }
 
-static QJsonDocument readJson(const QString& path) {
+static QJsonDocument readJson(const QString& path, QString& error) {
     QFile file(path);
     if (!file.open(QIODevice::ReadOnly)) {
-        qDebug() << "cannot open" << path;
+        error = QString("cannot open %1").arg(path);
         return QJsonDocument();
     }
     QByteArray data = file.readAll();
     QJsonParseError err;
     QJsonDocument doc = QJsonDocument::fromJson(data, &err);
     if (err.error != QJsonParseError::NoError) {
-        qDebug() << err.errorString();
+        error = err.errorString();
     }
     return doc;
 }
 
-static QHash<QString, QString> loadEmmetDict() {
+static QHash<QString, QString> loadEmmetDict(QString& error) {
     QHash<QString, QString> dict;
     QDir dir(qApp->applicationDirPath());
-    if (dir.dirName() == "debug") {
+    if (dir.dirName() == "debug" || dir.dirName() == "release" || dir.dirName() == "build") {
         dir.cdUp();
     }
+    if (dir.dirName() == "bin") {
+        dir.cdUp();
+        dir.cd("share");
+    }
     /*if (dir.dirName() == "mugi-query") {
         dir.cd("lib");
         dir.cd("emmet");
     }*/
     QString path = dir.filePath("emmet.json");
-    QJsonDocument doc = readJson(path);
+    QJsonDocument doc = readJson(path, error);
     QJsonArray arr = doc.array();
     QStringList keys;
     for(QJsonArray::iterator it=arr.begin(); it!= arr.end(); it++) {
@@ -160,9 +164,9 @@ QString parseCw(const QString& text) {
     return QString();
 }
 
-QString Emmet::parse(const QString& text) {
+QString Emmet::parse(const QString& text, QString& error) {
 
-    static QHash<QString, QString> dict = loadEmmetDict();
+    static QHash<QString, QString> dict = loadEmmetDict(error);
 
     QStringList res;
     QString tail = text;

src/emmet.h

@@ -8,7 +8,7 @@
 class EMMET_EXPORT Emmet
 {
 public:
-    static QString parse(const QString &text);
+    static QString parse(const QString &text, QString& error);
 };
 
 #endif // EMMET_H

src/schema2/schema2data.cpp

@@ -21,7 +21,10 @@
 #include <QSortFilterProxyModel>
 #include "checkablestringlistmodel.h"
 
-#include <QAxObject>
+#ifdef Q_OS_WIN
+    #include <QAxObject>
+#endif
+
 #include <QStandardItemModel>
 #include "history.h"
 #include <QSqlError>
@@ -230,6 +233,7 @@ void Schema2Data::pullTablesOdbc() {
     if (filePath.isEmpty()) {
         return;
     }
+#ifdef Q_OS_WIN
 
     QAxObject engine("DAO.DBEngine.120");
     QAxObject* database = engine.querySubObject("OpenDatabase(QString, bool)", filePath, false);
@@ -275,10 +279,9 @@ void Schema2Data::pullTablesOdbc() {
         mTables->updateColumns(tableName);
 
     }
-
-
-
-
+#else
+    // todo
+#endif
 }
 
 
@@ -454,6 +457,8 @@ void Schema2Data::pullIndexesOdbc() {
         return;
     }
 
+#ifdef Q_OS_WIN
+
     QAxObject engine("DAO.DBEngine.120");
 
     QAxObject* database = engine.querySubObject("OpenDatabase(QString)", filePath);
@@ -513,6 +518,9 @@ void Schema2Data::pullIndexesOdbc() {
 
         }
     }
+#else
+
+#endif
 
 
 }
@@ -538,6 +546,8 @@ void Schema2Data::pullRelationsOdbc() {
         return;
     }
 
+#ifdef Q_OS_WIN
+
     QAxObject engine("DAO.DBEngine.120");
     QAxObject* database = engine.querySubObject("OpenDatabase(QString, bool)", filePath, false);
     QAxObject* relations = database->querySubObject("Relations");
@@ -568,7 +578,9 @@ void Schema2Data::pullRelationsOdbc() {
 
 
     }
-
+#else
+    // todo
+#endif
 
 }
 

src/tst_emmet.cpp

@@ -28,7 +28,11 @@ void tst_Emmet::testCw()
 {
     QFETCH(QString, in);
     QFETCH(QString, expected);
-    QString parsed = Emmet::parse(in);
+    QString error;
+    QString parsed = Emmet::parse(in, error);
+    if (!error.isEmpty()) {
+        qDebug() << error;
+    }
     //qDebug() << parsed;
     QCOMPARE(wssplit(parsed), wssplit(expected));
 }

src/widget/radiobuttons.cpp

@@ -25,7 +25,7 @@ void RadioButtons::init(const QStringList &items, int checkedIndex)
             button->setChecked(true);
         }
         mButtons.append(button);
-        connect(button, qOverload<bool>(QRadioButton::clicked),[=](bool on){
+        connect(button, qOverload<bool>(&QRadioButton::clicked),[=](bool on){
             if (on) {
                 emit clicked(i);
             }

src/widget/textedit.cpp

@@ -392,7 +392,7 @@ static QTextCursor selectEmmetExpression(const QTextCursor& cursor) {
     return begin;
 }
 
-
+#include <QMessageBox>
 
 bool TextEdit::tryEmmet() {
     if (!cursorAtEndOfWord()) {
@@ -404,7 +404,12 @@ bool TextEdit::tryEmmet() {
         qDebug() << "cursor.selectedText() is empty";
         return false;
     }
-    QString e = Emmet::parse(text);
+    QString error;
+    QString e = Emmet::parse(text, error);
+    if (!error.isEmpty()) {
+        QMessageBox::critical(this, "Error", error);
+        return false;
+    }
     if (e.isEmpty()) {
         qDebug() << "cannot emmet text" << text;
         return false;