Merge pull request #1295 from github/820-local

820 local

lib/linguist/languages.yml

@@ -1740,6 +1740,12 @@ QML:
   extensions:
   - .qml
 
+QMake:
+  lexer: Text only
+  extensions:
+  - .pro
+  - .pri
+
 R:
   type: programming
   color: "#198ce7"

lib/linguist/samples.json

@@ -480,6 +480,11 @@
       ".pyp",
       ".script!"
     ],
+    "QMake": [
+      ".pri",
+      ".pro",
+      ".script!"
+    ],
     "R": [
       ".R",
       ".Rd",
@@ -773,8 +778,8 @@
       "exception.zep.php"
     ]
   },
-  "tokens_total": 643251,
+  "tokens_total": 643370,
-  "languages_total": 836,
+  "languages_total": 840,
   "tokens": {
     "ABAP": {
       "*/**": 1,
@@ -57667,6 +57672,70 @@
       "e.args": 1,
       "socket.EAI_NONAME": 1
     },
+    "QMake": {
+      "QT": 4,
+      "+": 13,
+      "core": 2,
+      "gui": 2,
+      "greaterThan": 1,
+      "(": 8,
+      "QT_MAJOR_VERSION": 1,
+      ")": 8,
+      "widgets": 1,
+      "contains": 2,
+      "QT_CONFIG": 2,
+      "opengl": 2,
+      "|": 1,
+      "opengles2": 1,
+      "{": 6,
+      "}": 6,
+      "else": 2,
+      "DEFINES": 1,
+      "QT_NO_OPENGL": 1,
+      "TEMPLATE": 2,
+      "app": 2,
+      "win32": 2,
+      "TARGET": 3,
+      "BlahApp": 1,
+      "RC_FILE": 1,
+      "Resources/winres.rc": 1,
+      "blahapp": 1,
+      "include": 1,
+      "functions.pri": 1,
+      "SOURCES": 2,
+      "file.cpp": 2,
+      "HEADERS": 2,
+      "file.h": 2,
+      "FORMS": 2,
+      "file.ui": 1,
+      "RESOURCES": 1,
+      "res.qrc": 1,
+      "exists": 1,
+      ".git/HEAD": 1,
+      "system": 2,
+      "git": 1,
+      "rev": 1,
+      "-": 1,
+      "parse": 1,
+      "HEAD": 1,
+      "rev.txt": 2,
+      "echo": 1,
+      "ThisIsNotAGitRepo": 1,
+      "SHEBANG#!qmake": 1,
+      "message": 1,
+      "This": 1,
+      "is": 1,
+      "QMake.": 1,
+      "CONFIG": 1,
+      "qt": 1,
+      "simpleapp": 1,
+      "file2.c": 1,
+      "This/Is/Folder/file3.cpp": 1,
+      "file2.h": 1,
+      "This/Is/Folder/file3.h": 1,
+      "This/Is/Folder/file3.ui": 1,
+      "Test.ui": 1
+    },
     "R": {
       "df.residual.mira": 1,
       "<": 46,
@@ -69651,6 +69720,7 @@
     "Protocol Buffer": 63,
     "PureScript": 1652,
     "Python": 6587,
+    "QMake": 119,
     "R": 1790,
     "Racket": 331,
     "Ragel in Ruby Host": 593,
@@ -69847,6 +69917,7 @@
     "Protocol Buffer": 1,
     "PureScript": 4,
     "Python": 10,
+    "QMake": 4,
     "R": 7,
     "Racket": 2,
     "Ragel in Ruby Host": 3,
@@ -69905,5 +69976,5 @@
     "Zephir": 5,
     "Zimpl": 1
   },
-  "md5": "dac5efdbb630ce51506df095cd2a6e40"
+  "md5": "72caade4a1a1dc14e10dd5478a6a5978"
 }

samples/QMake/complex.pro

@@ -0,0 +1,30 @@
+# This QMake file is complex, as it usese
+# boolean operators and function calls
+
+QT += core gui
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+# We could use some OpenGL right now
+contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) {
+   QT += opengl
+} else {
+   DEFINES += QT_NO_OPENGL
+}
+
+TEMPLATE = app
+win32 {
+    TARGET = BlahApp
+    RC_FILE = Resources/winres.rc
+}
+!win32 { TARGET = blahapp }
+
+# Let's add a PRI file!
+include(functions.pri)
+
+SOURCES += file.cpp
+
+HEADERS  += file.h
+
+FORMS    += file.ui
+
+RESOURCES += res.qrc

samples/QMake/functions.pri

@@ -0,0 +1,8 @@
+# QMake include file that calls some functions
+# and does nothing else...
+
+exists(.git/HEAD) {
+    system(git rev-parse HEAD >rev.txt)
+} else {
+    system(echo ThisIsNotAGitRepo >rev.txt)
+}

samples/QMake/qmake.script!

@@ -0,0 +1,2 @@
+#!/usr/bin/qmake
+message(This is QMake.)

samples/QMake/simple.pro

@@ -0,0 +1,17 @@
+# Simple QMake file
+
+CONFIG += qt
+QT += core gui
+TEMPLATE = app
+TARGET = simpleapp
+
+SOURCES += file.cpp \
+    file2.c \
+    This/Is/Folder/file3.cpp
+
+HEADERS += file.h \
+    file2.h \
+    This/Is/Folder/file3.h
+
+FORMS += This/Is/Folder/file3.ui \
+    Test.ui