diff options
author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-26 12:25:43 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-26 12:25:58 +0200 |
commit | 2f12c578fbf6bc047700abd0e1cd1ce15a90ff52 (patch) | |
tree | dcc9d2166fcc979b6bc43c70b330db9c7acf0832 | |
parent | 03143da00f27512376c75d346bfe2965cd73f13e (diff) | |
parent | a397aef6b1bd828f3c9e209c48c627a33dee6e14 (diff) | |
download | qtgraphicaleffects-2f12c578fbf6bc047700abd0e1cd1ce15a90ff52.tar.gz qtgraphicaleffects-2f12c578fbf6bc047700abd0e1cd1ce15a90ff52.tar.bz2 qtgraphicaleffects-2f12c578fbf6bc047700abd0e1cd1ce15a90ff52.zip |
Merge remote-tracking branch 'gerrit/master' into newdocs
Change-Id: If531749e5b7113e693edb340ffe82f76ebe16c6b
-rw-r--r-- | .qmake.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.qmake.conf b/.qmake.conf new file mode 100644 index 0000000..42ba8e4 --- /dev/null +++ b/.qmake.conf @@ -0,0 +1 @@ +load(qt_build_config) |