Skip to content

Commit e4cc106

Browse files
committed
replaced subrepo by qpm
1 parent ffe6307 commit e4cc106

File tree

13 files changed

+1054
-7
lines changed

13 files changed

+1054
-7
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
This file was deleted.

.qmake.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ load(qt_build_config)
22

33
CONFIG += warning_clean exceptions
44

5-
MODULE_VERSION = 2.1.0
5+
MODULE_VERSION = 2.1.1

src/3rdparty/QtUtils

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/3rdparty/qpm.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"name": "",
3+
"description": "",
4+
"dependencies": [
5+
"de.skycoder42.dialog-master@1.2.5"
6+
],
7+
"license": "NONE",
8+
"pri_filename": "",
9+
"webpage": ""
10+
}
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# C++ objects and libs
2+
3+
*.slo
4+
*.lo
5+
*.o
6+
*.a
7+
*.la
8+
*.lai
9+
*.so
10+
*.dll
11+
*.dylib
12+
13+
# Qt-es
14+
15+
/.qmake.cache
16+
/.qmake.stash
17+
*.pro.user
18+
*.pro.user.*
19+
*.qbs.user
20+
*.qbs.user.*
21+
*.moc
22+
moc_*.cpp
23+
qrc_*.cpp
24+
ui_*.h
25+
Makefile*
26+
*build-*
27+
28+
# QtCreator
29+
30+
*.autosave
31+
32+
#QtCtreator Qml
33+
*.qmlproject.user
34+
*.qmlproject.user.*
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
Copyright (c) 2016, Felix Barz
2+
All rights reserved.
3+
4+
Redistribution and use in source and binary forms, with or without
5+
modification, are permitted provided that the following conditions are met:
6+
7+
* Redistributions of source code must retain the above copyright notice, this
8+
list of conditions and the following disclaimer.
9+
10+
* Redistributions in binary form must reproduce the above copyright notice,
11+
this list of conditions and the following disclaimer in the documentation
12+
and/or other materials provided with the distribution.
13+
14+
* Neither the name of DialogMaster nor the names of its
15+
contributors may be used to endorse or promote products derived from
16+
this software without specific prior written permission.
17+
18+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
22+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
24+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
25+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
26+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# DialogMaster
2+
A utility to create optimized dialogs with Qt
3+
4+
## Features
5+
Provides a namespace with improved versions of all the dialogs Qt provides. By using these, things like modality, titles and window decoration get handled by the system.
6+
The dialogs include:
7+
8+
- A generic method to setup any QDialog
9+
- QMessageBox, with the common methods as well as a setup for custom message boxes
10+
- QInputDialog
11+
- QProgressDialog
12+
- QFileDialog
13+
- QColorDialog
14+
- QFontDialog
15+
16+
## Installation
17+
The package is providet as qpm package, [`de.skycoder42.dialog-master`](https://www.qpm.io/packages/de.skycoder42.dialog-master/index.html). To install:
18+
19+
1. Install qpm (See [GitHub - Installing](https://github.com/Cutehacks/qpm/blob/master/README.md#installing))
20+
2. In your projects root directory, run `qpm install de.skycoder42.dialog-master`
21+
3. Include qpm to your project by adding `include(vendor/vendor.pri)` to your `.pro` file
22+
23+
Check their [GitHub - Usage for App Developers](https://github.com/Cutehacks/qpm/blob/master/README.md#usage-for-app-developers) to learn more about qpm.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
CONFIG *= C++11
2+
3+
HEADERS += $$PWD/dialogmaster.h
4+
SOURCES += $$PWD/dialogmaster.cpp
5+
6+
INCLUDEPATH += $$PWD

0 commit comments

Comments
 (0)