Commit Graph

4483 Commits

Author SHA1 Message Date
Sergio Martins
d8e0be874b Merge branch 'master' into 2.0
Merged with "-s ours", as master only contained clang-format changes
already present in 2.0.
2022-07-12 11:35:01 +01:00
Sergio Martins
296de10571 Merge branch '1.6' 2022-07-12 11:31:14 +01:00
Sergio Martins
4691f9bfa5 Ran clang-format over the codebase 2022-07-12 11:28:05 +01:00
Sergio Martins
9ae0ab294c Windows: Fix build 2022-07-11 15:06:29 -07:00
Sergio Martins
760fc8d0fb Fix build of dummy frontend with Qt5 2022-07-11 13:52:11 -07:00
Sergio Martins
62020a3ff9 qtquick|example: Allow users to test floating windows with native titlebar 2022-07-11 21:43:16 +01:00
Sergio Martins
e7c51aabd3 Merge branch 'master' into 2.0 2022-07-11 21:15:34 +01:00
Sergio Martins
e83996b402 Merge branch '1.6' 2022-07-11 21:15:18 +01:00
Sergio Martins
c7dd7d954f pre-commit: Don't clang-format json files
Not until I find out how to make vscode use clang-format for
json. It seems to be using its own formatter.
2022-07-11 21:14:15 +01:00
Sergio Martins
64a4ad5029 Fix build when dummy platform is disabled 2022-07-11 19:31:26 +01:00
Sergio Martins
7e051d5e71 Merge branch 'master' into 2.0 2022-07-11 19:24:58 +01:00
Sergio Martins
0d82880ea7 Merge branch '1.6' 2022-07-11 19:24:43 +01:00
Sergio Martins
0f66fe853d pre-commit: Allow for multi-document yaml files
Which is valid yaml.
In case we want to make settings for json formatting in .clang-format.
2022-07-11 19:23:58 +01:00
Sergio Martins
fe18f994ac Allow dummy to be built against Qt5 too 2022-07-11 19:18:42 +01:00
Allen Winter
025c49c583 buildsystem - sync with cmake ECM and KDAB upstream 2022-07-11 12:27:24 -04:00
Sergio Martins
a5e7b94da1 dummy: Don't look for QtWidgets, QtGui is enough
We still depend on QtGui for QMouseEvent, that needs to be
abstracted out
2022-07-11 17:22:39 +01:00
Sergio Martins
77e19fa5bd Revert "cmake: Remove KDDockWidgets_QT6 from dummy preset"
This reverts commit 2666ed3f5e.

It's still needed, didn't notice as it would need a clean build
to repro the failure.
2022-07-11 17:19:45 +01:00
Sergio Martins
8ad64e5e6f Fix dummy frontend build without QtWidgets
Next step is removing QtGui depenency
2022-07-11 17:14:05 +01:00
Sergio Martins
8b3a17d629 cmake: Treat dummy frontend like any other
Gets enabled by cmake presets now
2022-07-11 15:55:52 +01:00
Sergio Martins
2666ed3f5e cmake: Remove KDDockWidgets_QT6 from dummy preset
It doesn't need Qt conceptually.
2022-07-11 15:12:11 +01:00
Sergio Martins
68e9f4bcea dummy: Ifdef the test functions with developer mode
Fixes release build
2022-07-11 15:08:06 +01:00
Sergio Martins
ecb2c4ff47 Remove QtWidgets from ViewFactory_dummy 2022-07-11 14:54:50 +01:00
Sergio Martins
37688e1874 cmake: Allow to build only dummy frontend
The goal will be to make sure that the backend builds without Qt.
For now, dummy still links to Qt, but we're working on it.
2022-07-11 14:23:03 +01:00
Sergio Martins
adcde3a65c tests: Add tst_dummyplatform
Its only purpose is to instantiate some classes so we're sure
they implement all needed pure virtuals

The dummy platform is just used for copy-pasting into a new
platform, so let's cover as much boiler-plate as possible
2022-07-11 13:45:48 +01:00
Allen Winter
1f7c1e4188 Merge branch 'master' into 2.0 2022-07-11 08:38:22 -04:00
Allen Winter
35c9ccdd6a Merge branch '1.6' 2022-07-11 08:36:52 -04:00
Allen Winter
518724132b fix a few missed pylint issues 2022-07-11 08:36:12 -04:00
Sergio Martins
b784780428 Add Dummy enumerator to FrontendTypes
so we can test that it reimplements all pure virtual methods.
We get a compiler-error now if any is missing.

Added the missing pure virtual methods too.
2022-07-11 11:54:38 +01:00
Sergio Martins
6ebb680c92 Re-ran clang-format 14 over the source
Fixes some differences with clang 13
2022-07-11 11:40:38 +01:00
Sergio Martins
ceab323916 Move qobjectAsView() and qobjectAsWindow from Platform.h to Platform_qt.h
As it's Qt specific
2022-07-10 23:04:37 +01:00
Sergio Martins
92b49f78a9 View CTOR no longer receives "thisQObject" via argument
It's unused, views don't need to be QObject based anymore
2022-07-10 22:44:54 +01:00
Sergio Martins
8e7e68eddc Rename View_qt::asObject() to View_qt::asQObject()
Which can be done now since View::asQObject() is gone
2022-07-10 22:31:47 +01:00
Sergio Martins
1c21555767 Finally remove View::asQObject()
It's not required anymore.
2022-07-10 22:29:31 +01:00
Sergio Martins
2f6d618048 Remove View::asQObject() occurrances from Platform_qt 2022-07-10 22:12:54 +01:00
Sergio Martins
f9b806ede5 Fix memory leak 2022-07-10 22:08:08 +01:00
Sergio Martins
8894572174 Remove one usage of asQObject from WidgetResizeHandler
It's being deleted manually, so no need to pass parent.
View::asQObject() will be removed soon
2022-07-10 21:55:13 +01:00
Sergio Martins
2c924a3a82 Remove some QPointer usages and include cleanup 2022-07-10 18:42:28 +01:00
Sergio Martins
640ef58553 Allow to pass View* to qDebug 2022-07-10 18:36:35 +01:00
Sergio Martins
897e0debca Replace draggableForQObject with draggableForView 2022-07-10 17:58:27 +01:00
Sergio Martins
233736a20b Replace QPointer with a ViewGuard 2022-07-09 17:07:23 +01:00
Allen Winter
e3c08593b9 src/qtcommon/Platform_qt.h - QT_NAMESPACE 2022-07-09 12:05:54 -04:00
Allen Winter
f6315ba4c0 src/EventFilterInterface.h - QT_NAMESPACE 2022-07-09 11:51:31 -04:00
Allen Winter
1bb3e5de37 CMakeLists.txt - fix a typo that causing --warn-uninitialize 2022-07-09 11:42:47 -04:00
Allen Winter
54a29b5cae Merge branch 'master' into 2.0 2022-07-09 11:09:35 -04:00
Sergio Martins
800d97c352 Fix 2 clazy warnings 2022-07-09 14:38:01 +01:00
Allen Winter
2f9f2c9ba6 Merge branch '1.6' 2022-07-09 09:17:19 -04:00
Allen Winter
ba7afe20b0 fix misspelling 2022-07-09 09:16:59 -04:00
Allen Winter
146338c9f4 Merge branch '1.6' 2022-07-09 09:14:53 -04:00
Allen Winter
0b5b06dc5a .gitignore - ignore python/examples-qt6/rc_assets.py 2022-07-09 09:12:17 -04:00
Allen Winter
460b898bea cmake-lint, cmake-format CMake files 2022-07-09 09:11:45 -04:00