Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove qmake project files. #603

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
.gitconfig
CMakeLists.txt.user
*.pro.user
build/
.project
Makefile
buildlib/
release/
.cproject
*.pro.user*
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if this helps anyone or improve something.
But it's not wrong.

.settings
*.orig
*~
Expand Down
7 changes: 0 additions & 7 deletions BuildDltParser.pro

This file was deleted.

13 changes: 0 additions & 13 deletions BuildDltViewer.pro

This file was deleted.

5 changes: 3 additions & 2 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Alexander Wenzel <[email protected]>

* Install Qt5 SDK and Qt6 SDK including Qt Creator and Microsoft Visual Studio Build Tools 2019
* Tested with QT 5.15.2 (Windows), QT 6.7.3 (Windows), and Qt 5.15.13 (Ubuntu 24.04LTS Linux)
* Open project BuildDltViewer.pro in Qt Creator.
* Open project CMakeLists.txt in Qt Creator.
* Ensure that build options point to correct QT and MSVC.
* Build Release in Qt Creator or via CMake (see last).
* Optional Linux: set the library path in Qt Creator: Add variable to Projects/Build Settings/Build Environment: LD_LIBRARY_PATH = .
Expand All @@ -19,7 +19,7 @@ Alexander Wenzel <[email protected]>
* sudo apt install libqt5serialport5-dev
* mkdir build
* cd build
* qmake ../BuildDltViewer.pro
* cmake ..
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This complete INSTALL.md is always outdated like a newspaper, I would simply point to the CI build script and delete complete file

* make
* sudo make install
* sudo ldconfig
Expand Down Expand Up @@ -129,6 +129,7 @@ Steps to follow:

* mkdir build
* cd build
* TODO: Change to cmake
* <path to Qt folder>/Qt/5.X/gcc_64/bin/qmake <path to BuildDltViewer.pro>/BuildDltViewer.pro -r
* make

Expand Down
37 changes: 0 additions & 37 deletions commander/commander.pro

This file was deleted.

1 change: 1 addition & 0 deletions doc/dlt_viewer_plugins_programming_guide.txt
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ Q_EXPORT_PLUGIN2(dummyplugin, DummyPlugin);
#endif
----

TODO: Use cmake file instead.
.dummyplugin.pro
----
# include global settings for all DLT Viewer Plugins
Expand Down
3 changes: 3 additions & 0 deletions doc/dlt_viewer_user_manual.tex
Original file line number Diff line number Diff line change
Expand Up @@ -2104,6 +2104,7 @@ \subsection{Linux}

\subsubsection{qmake}

TODO: Use cmake file instead.
Now add the plugin to plugins/plugin.pro

\begin{verbatim}
Expand All @@ -2112,6 +2113,7 @@ \subsubsection{qmake}

Build the Viewer:
\begin{verbatim}
TODO: Use cmake file instead.
qmake BuildDltViewer.pro
make
\end{verbatim}
Expand Down Expand Up @@ -2161,6 +2163,7 @@ \subsubsection{Build qwt}
C:\Qwt-6.1.3_2015_5.8_64bit
\end{verbatim}

TODO: Use cmake file instead.
\subsubsection{Build Viewer using qmake}

Now add the plugin to plugins/plugin.pro
Expand Down
21 changes: 0 additions & 21 deletions plugin/dltdbusplugin/dltdbusplugin.pro

This file was deleted.

27 changes: 0 additions & 27 deletions plugin/dltlogstorageplugin/dltlogstorageplugin.pro

This file was deleted.

25 changes: 0 additions & 25 deletions plugin/dltsegmentationplugin/dltsegmentationplugin.pro

This file was deleted.

25 changes: 0 additions & 25 deletions plugin/dltsystemviewerplugin/dltsystemviewerplugin.pro

This file was deleted.

25 changes: 0 additions & 25 deletions plugin/dlttestrobotplugin/dlttestrobotplugin.pro

This file was deleted.

25 changes: 0 additions & 25 deletions plugin/dltviewerplugin/dltviewerplugin.pro

This file was deleted.

23 changes: 0 additions & 23 deletions plugin/dummycommandplugin/dummycommandplugin.pro

This file was deleted.

25 changes: 0 additions & 25 deletions plugin/dummycontrolplugin/dummycontrolplugin.pro

This file was deleted.

22 changes: 0 additions & 22 deletions plugin/dummydecoderplugin/dummydecoderplugin.pro

This file was deleted.

25 changes: 0 additions & 25 deletions plugin/dummyviewerplugin/dummyviewerplugin.pro

This file was deleted.

Loading